From 8ae39ab3a0bb12f17d2cabfdc27725b0992ba3c3 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Fri, 20 Mar 2015 15:53:44 -0400
Subject: Backed out changeset 6e045b2724d0 and 56d7ea3d42b2. Ref #307.

---
 pkg_resources/__init__.py             |  4 ++--
 pkg_resources/tests/test_resources.py | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'pkg_resources')

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):
-- 
cgit v1.2.1