From 7c657cfdcd2c717183b865c7eb5f9d70c7d0dfe7 Mon Sep 17 00:00:00 2001
From: ingstem <github@ingstem.dev>
Date: Sun, 4 Jan 2026 18:55:03 +0100
Subject: [PATCH] Codechange: Change Ply and Pillow import statements

- Change to using nml.ply instead of .ply in import statements
- Change imports to only import __version__
- Change Pillow import to be similar to new fixed Ply import
- Fix Ply import not using __version__ from bundled Ply
---
 nml/parser.py       |  2 +-
 nml/tokens.py       |  2 +-
 nml/version_info.py | 11 ++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/nml/parser.py b/nml/parser.py
index 9df8670d7..efabf0ec6 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 56e10f6a9..42e0b0c5e 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 2cc4a4082..b9e9bc69c 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