utils: fix canonical package name regex

Relates-to: python-poetry/poetry#3132 Relates-to: python-poetry/poetry#3200
python-poetry · Oct 15, 2020 · b0d9086 · b0d9086
1 parent 0db07bc
commit b0d9086
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/poetry/core/utils/helpers.py b/poetry/core/utils/helpers.py
@@ -17,7 +17,7 @@
     from collections import Mapping
 
 
-_canonicalize_regex = re.compile("[-_]+")
+_canonicalize_regex = re.compile(r"[-_.]+")
 
 
 def canonicalize_name(name):  # type: (str) -> str

diff --git a/tests/utils/test_helpers.py b/tests/utils/test_helpers.py
@@ -1,3 +1,6 @@
+import pytest
+
+from poetry.core.utils.helpers import canonicalize_name
 from poetry.core.utils.helpers import parse_requires
 
 
@@ -52,3 +55,10 @@ def test_parse_requires():
         'isort@ git+git://github.com/timothycrosley/isort.git@e63ae06ec7d70b06df9e528357650281a3d3ec22#egg=isort ; extra == "dev"',
     ]
     assert result == expected
+
+
+@pytest.mark.parametrize(
+    "raw", ["a-b-c", "a.b-c", "a.b.c", "a_b-c", "a_b_c", "a-b_c", "a.b_c", "a-b.c"]
+)
+def test_utils_helpers_canonical_names(raw):
+    assert canonicalize_name(raw) == "a-b-c"