diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-20 15:55:54 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-20 15:55:54 -0400 |
| commit | 110e541bd3a2df54492b8aaae6e041601653ca66 (patch) | |
| tree | 058a246619e65780b130f33263bb4b70ca02f921 /pkg_resources/__init__.py | |
| parent | 5e00a02ea1f7473c952d4d359891db4f53ac1778 (diff) | |
| parent | 8ae39ab3a0bb12f17d2cabfdc27725b0992ba3c3 (diff) | |
| download | external_python_setuptools-110e541bd3a2df54492b8aaae6e041601653ca66.tar.gz external_python_setuptools-110e541bd3a2df54492b8aaae6e041601653ca66.tar.bz2 external_python_setuptools-110e541bd3a2df54492b8aaae6e041601653ca66.zip | |
Merge backout
Diffstat (limited to 'pkg_resources/__init__.py')
| -rw-r--r-- | pkg_resources/__init__.py | 3 |
1 files changed, 1 insertions, 2 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 |