Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nml/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nml/tokens.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import re
import sys

from .ply import lex
from nml.ply import lex

from nml import expression, generic

Expand Down
11 changes: 4 additions & 7 deletions nml/version_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down