diff --git a/nml/parser.py b/nml/parser.py index 9df8670d..efabf0ec 100644 --- a/nml/parser.py +++ b/nml/parser.py @@ -13,7 +13,7 @@ with NML; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.""" -from .ply import yacc +from nml.ply import yacc from nml import expression, generic, nmlop, tokens, unit from nml.actions import actionD, real_sprite diff --git a/nml/tokens.py b/nml/tokens.py index 56e10f6a..42e0b0c5 100644 --- a/nml/tokens.py +++ b/nml/tokens.py @@ -16,7 +16,7 @@ import re import sys -from .ply import lex +from nml.ply import lex from nml import expression, generic diff --git a/nml/version_info.py b/nml/version_info.py index 2cc4a408..b9e9bc69 100644 --- a/nml/version_info.py +++ b/nml/version_info.py @@ -21,19 +21,16 @@ def get_lib_versions(): versions = {} # PIL try: - import PIL + from PIL import __version__ as pil_version - versions["PIL"] = PIL.__version__ + versions["PIL"] = pil_version except ImportError: versions["PIL"] = "Not found!" # PLY - try: - from ply import lex + from nml.ply import __version__ as ply_version - versions["PLY"] = lex.__version__ - except ImportError: - versions["PLY"] = "Not found!" + versions["PLY"] = ply_version return versions