use packaging.utils.canonicalize_name() (python-poetry#418)

Author: dimbleby

src/poetry/core/masonry/metadata.py

@@ -45,7 +45,8 @@ class Metadata:
 
     @classmethod
     def from_package(cls, package: Package) -> Metadata:
-        from poetry.core.utils.helpers import canonicalize_name
+        from packaging.utils import canonicalize_name
+
         from poetry.core.utils.helpers import normalize_version
         from poetry.core.version.helpers import format_python_constraint
 

src/poetry/core/packages/dependency_group.py

@@ -31,7 +31,7 @@ def add_dependency(self, dependency: Dependency) -> None:
         self._dependencies.append(dependency)
 
     def remove_dependency(self, name: str) -> None:
-        from poetry.core.utils.helpers import canonicalize_name
+        from packaging.utils import canonicalize_name
 
         name = canonicalize_name(name)
 

src/poetry/core/packages/specification.py

@@ -22,7 +22,7 @@ def __init__(
         source_subdirectory: str | None = None,
         features: Iterable[str] | None = None,
     ) -> None:
-        from poetry.core.utils.helpers import canonicalize_name
+        from packaging.utils import canonicalize_name
 
         self._pretty_name = name
         self._name = canonicalize_name(name)
@@ -47,7 +47,7 @@ def pretty_name(self) -> str:
 
     @property
     def complete_name(self) -> str:
-        name = self._name
+        name: str = self._name
 
         if self._features:
             features = ",".join(sorted(self._features))

src/poetry/core/pyproject/tables.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from poetry.core.utils.helpers import canonicalize_name
+from packaging.utils import canonicalize_name
 
 
 if TYPE_CHECKING:

src/poetry/core/utils/helpers.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import os
-import re
 import shutil
 import stat
 import tempfile
@@ -14,22 +13,17 @@
 from typing import Iterator
 from typing import no_type_check
 
-from poetry.core.version.pep440 import PEP440Version
-
+from packaging.utils import canonicalize_name
 
-_canonicalize_regex = re.compile(r"[-_.]+")
+from poetry.core.version.pep440 import PEP440Version
 
 
 def combine_unicode(string: str) -> str:
     return unicodedata.normalize("NFC", string)
 
 
-def canonicalize_name(name: str) -> str:
-    return _canonicalize_regex.sub("-", name).lower()
-
-
 def module_name(name: str) -> str:
-    return canonicalize_name(name).replace(".", "_").replace("-", "_")
+    return canonicalize_name(name).replace("-", "_")
 
 
 def normalize_version(version: str) -> str:

tests/utils/test_helpers.py

@@ -7,7 +7,6 @@
 
 import pytest
 
-from poetry.core.utils.helpers import canonicalize_name
 from poetry.core.utils.helpers import combine_unicode
 from poetry.core.utils.helpers import normalize_version
 from poetry.core.utils.helpers import parse_requires
@@ -144,11 +143,6 @@ def test_parse_requires() -> None:
     assert result == expected
 
 
-@pytest.mark.parametrize("raw", ["a-b-c", "a_b-c", "a_b_c", "a-b_c", "a.b-c"])
-def test_utils_helpers_canonical_names(raw: str) -> None:
-    assert canonicalize_name(raw) == "a-b-c"
-
-
 def test_utils_helpers_combine_unicode() -> None:
     combined_expected = "é"
     decomposed = "é"