fix wppm bug

stonebig · stonebig · commit f947b531cdaa · 2025-08-23T11:03:11.000+02:00
diff --git a/wppm/__init__.py b/wppm/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '17.2.20250815b3'
+__version__ = '17.2.20250823'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/wppm/packagemetadata.py b/wppm/packagemetadata.py
@@ -13,7 +13,6 @@
 import importlib.metadata
 import email
 #from packaging.utils import canonicalize_name
-from utils import normalize as canonicalize_name
 # --- Abstract metadata accessor ---
 
 class PackageMetadata:
@@ -31,7 +30,7 @@ def get_installed_metadata(path = None) -> List[PackageMetadata]:
     pkgs = []
     distro = importlib.metadata.distributions(path = path) if path else importlib.metadata.distributions()
     for dist in distro:
-        name = canonicalize_name(dist.metadata['Name'])
+        name = utils.canonicalize_name(dist.metadata['Name'])
         version = dist.version
         summary = dist.metadata.get("Summary", ""),
         description = dist.metadata.get("Description", ""),
@@ -73,7 +72,7 @@ def extract_metadata_from_sdist(path: str) -> PackageMetadata:
 
 def parse_metadata_file(txt: str) -> PackageMetadata:
     meta = email.message_from_string(txt)
-    name = canonicalize_name(meta.get('Name', ''))
+    name = utils.canonicalize_name(meta.get('Name', ''))
     version = meta.get('Version', '')
     summary = meta.get('Summary', '')
     description = meta.get('Description', '')
diff --git a/wppm/utils.py b/wppm/utils.py
@@ -303,6 +303,10 @@ def normalize(this):
     """Apply PEP 503 normalization to the string."""
     return re.sub(r"[-_.]+", "-", this).lower()
 
+def canonicalize_name(this):
+    """Apply PEP 503 normalization to the string."""
+    return re.sub(r"[-_.]+", "-", this).lower()
+
 def zip_directory(folder_path, output_zip_path):
     folder_path = Path(folder_path)
     output_zip_path = Path(output_zip_path)
