diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-20 15:53:44 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-20 15:53:44 -0400 |
| commit | 8ae39ab3a0bb12f17d2cabfdc27725b0992ba3c3 (patch) | |
| tree | 7e6a4fefc9c5839a1f3e4fe32669befdc529c768 /pkg_resources | |
| parent | a074b625e3c765ac62cb4240d5c8d1d35152f8f4 (diff) | |
| download | python-setuptools-git-8ae39ab3a0bb12f17d2cabfdc27725b0992ba3c3.tar.gz | |
Backed out changeset 6e045b2724d0 and 56d7ea3d42b2. Ref #307.
Diffstat (limited to 'pkg_resources')
| -rw-r--r-- | pkg_resources/__init__.py | 4 | ||||
| -rw-r--r-- | pkg_resources/tests/test_resources.py | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 4cdb40dc..c3686f88 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -2267,8 +2267,8 @@ OBRACKET = re.compile(r"\s*\[").match CBRACKET = re.compile(r"\s*\]").match MODULE = re.compile(r"\w+(\.\w+)*$").match EGG_NAME = re.compile( - r"(?P<name>.*?)" - r"( -(?P<ver>[^-]+) (-py(?P<pyver>[^-]+) (-(?P<plat>.+))? )? )?$", + r"(?P<name>[^-]+)" + r"( -(?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): |