shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[feaLib.lexer] pass included filename token to IncludedFeaNotFound ...

Browse Source 
In the IncludedFeaNotFound error, pass on the filename token as
it was included in the include statement, so that a client can do their
thing (e.g. issue a warning to suggest the user to write the path
relative to the UFO itself, instead of relative to the feautures.fea
which is inside a UFO).

Also. resolve includes relative to current working directory when the
IncludingLexer' filename is None because it originates from an in-memory stream.
This commit is contained in:
Cosimo Lupo 2018-02-28 18:32:17 +00:00
parent ad7b97a7b2
commit b30704114b
No known key found for this signature in database
GPG Key ID: 59D54DB0C9976482
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Lib/fontTools/feaLib/lexer.py
View File

@ -56,7 +56,7 @@ class Lexer(object):
def location_(self): def location_(self):
column = self.pos_ - self.line_start_ + 1 column = self.pos_ - self.line_start_ + 1
return (self.filename_, self.line_, column) return (self.filename_ or "<features>", self.line_, column)
def next_(self): def next_(self):
self.scan_over_(Lexer.CHAR_WHITESPACE_) self.scan_over_(Lexer.CHAR_WHITESPACE_)
@ -211,33 +211,42 @@ class IncludingLexer(object):
#semi_type, semi_token, semi_location = lexer.next() #semi_type, semi_token, semi_location = lexer.next()
#if semi_type is not Lexer.SYMBOL or semi_token != ";": #if semi_type is not Lexer.SYMBOL or semi_token != ";":
# raise FeatureLibError("Expected ';'", semi_location) # raise FeatureLibError("Expected ';'", semi_location)
curpath = os.path.dirname(self.featurefilepath) if os.path.isabs(fname_token):
path = os.path.join(curpath, fname_token) path = fname_token
else:
if self.featurefilepath is not None:
curpath = os.path.dirname(self.featurefilepath)
else:
# if the IncludingLexer was initialized from an in-memory
# file-like stream, it doesn't have a 'name' pointing to
# its filesystem path, therefore we fall back to using the
# current working directory to resolve relative includes
curpath = os.getcwd()
path = os.path.join(curpath, fname_token)
if len(self.lexers_) >= 5: if len(self.lexers_) >= 5:
raise FeatureLibError("Too many recursive includes", raise FeatureLibError("Too many recursive includes",
fname_location) fname_location)
self.lexers_.append(self.make_lexer_(path, fname_location)) try:
continue self.lexers_.append(self.make_lexer_(path))
except IOError as err:
# FileNotFoundError does not exist on Python < 3.3
import errno
if err.errno == errno.ENOENT:
raise IncludedFeaNotFound(fname_token, fname_location)
raise # pragma: no cover
else: else:
return (token_type, token, location) return (token_type, token, location)
raise StopIteration() raise StopIteration()
@staticmethod @staticmethod
def make_lexer_(file_or_path, location=None): def make_lexer_(file_or_path):
if hasattr(file_or_path, "read"): if hasattr(file_or_path, "read"):
fileobj, closing = file_or_path, False fileobj, closing = file_or_path, False
else: else:
filename, closing = file_or_path, True filename, closing = file_or_path, True
try: fileobj = open(filename, "r", encoding="utf-8")
fileobj = open(filename, "r", encoding="utf-8")
except IOError as err:
# FileNotFoundError does not exist on Python < 3.3
import errno
if err.errno == errno.ENOENT:
raise IncludedFeaNotFound(str(err), location)
raise # pragma: no cover
data = fileobj.read() data = fileobj.read()
filename = fileobj.name if hasattr(fileobj, "name") else "<features>" filename = getattr(fileobj, "name", None)
if closing: if closing:
fileobj.close() fileobj.close()
return Lexer(data, filename) return Lexer(data, filename)