diff options
| -rw-r--r-- | pkg_resources/__init__.py | 3 | ||||
| -rw-r--r-- | pkg_resources/tests/test_resources.py | 10 |
2 files changed, 1 insertions, 12 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 6aac8296..b12ad0e0 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -2269,14 +2269,13 @@ CBRACKET = re.compile(r"\s*\]").match MODULE = re.compile(r"\w+(\.\w+)*$").match EGG_NAME = re.compile( r""" - (?P<name>.*?) ( + (?P<name>[^-]+) ( -(?P<ver>[^-]+) ( -py(?P<pyver>[^-]+) ( -(?P<plat>.+) )? )? )? - $ """, re.VERBOSE | re.IGNORECASE, ).match diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py index 92f076a1..a55478a2 100644 --- a/pkg_resources/tests/test_resources.py +++ b/pkg_resources/tests/test_resources.py @@ -207,16 +207,6 @@ class TestDistro: with pytest.raises(pkg_resources.UnknownExtra): d.requires(["foo"]) - def test_pkg_name_with_hyphen(self): - "Package names with hyphens are supported" - name = 'setuptools-markdown-1.0.egg' - dist = Distribution.from_filename(name) - assert dist.project_name == "setuptools-markdown" - assert dist.key == "setuptools-markdown" - assert dist.version == "1.0" - assert dist.py_version is None - assert dist.platform is None - class TestWorkingSet: def test_find_conflicting(self): |