Skip to content

Commit 1374036

Browse files
committed
Merge pull request #5563 from bsipocz/units_skip_generating_parsingtable
Skip generating generic unit parsing tables
1 parent 7d9fa5d commit 1374036

1 file changed

Lines changed: 16 additions & 7 deletions

File tree

‎astropy/units/format/generic.py‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,14 @@ def t_error(t):
156156
raise ValueError(
157157
"Invalid character at col {0}".format(t.lexpos))
158158

159-
lexer = lex.lex(optimize=True, lextab='generic_lextab',
160-
outputdir=os.path.dirname(__file__),
161-
reflags=re.UNICODE)
159+
try:
160+
from . import generic_lextab
161+
lexer = lex.lex(optimize=True, lextab=generic_lextab,
162+
reflags=re.UNICODE)
163+
except ImportError:
164+
lexer = lex.lex(optimize=True, lextab='generic_lextab',
165+
outputdir=os.path.dirname(__file__),
166+
reflags=re.UNICODE)
162167

163168
return lexer
164169

@@ -176,7 +181,6 @@ def _make_parser(cls):
176181
formats, the only difference being the set of available unit
177182
strings.
178183
"""
179-
180184
from ...extern.ply import yacc
181185

182186
tokens = cls._tokens
@@ -419,9 +423,14 @@ def p_function(p):
419423
def p_error(p):
420424
raise ValueError()
421425

422-
parser = yacc.yacc(debug=False, tabmodule='generic_parsetab',
423-
outputdir=os.path.dirname(__file__),
424-
write_tables=True)
426+
try:
427+
from . import generic_parsetab
428+
parser = yacc.yacc(debug=False, tabmodule=generic_parsetab,
429+
write_tables=False)
430+
except ImportError:
431+
parser = yacc.yacc(debug=False, tabmodule='generic_parsetab',
432+
outputdir=os.path.dirname(__file__))
433+
425434
return parser
426435

427436
@classmethod

0 commit comments

Comments
 (0)