diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-11-24 11:27:22 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-11-24 11:27:22 -0500 |
| commit | 998ceceaeb3dfce1b2b05a82aaf356db54f46de6 (patch) | |
| tree | 6859a65cd3733bd5f4d2f30c74f4dd40f34e9340 | |
| parent | f05162f5583979a3cc56492b91211cbe54353efa (diff) | |
| download | external_python_setuptools-998ceceaeb3dfce1b2b05a82aaf356db54f46de6.tar.gz external_python_setuptools-998ceceaeb3dfce1b2b05a82aaf356db54f46de6.tar.bz2 external_python_setuptools-998ceceaeb3dfce1b2b05a82aaf356db54f46de6.zip | |
Back out 435b1b762fba. The change breaks detection of zip eggs. Reopens #462.
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | pkg_resources/__init__.py | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 60d43fb2..bd05b8bd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,13 +3,6 @@ CHANGES ======= ---- -18.6 ----- - -* Issue #462: Provide a more refined detection of unpacked egg - directories, avoiding detecting zc.recipe.egg wheel as an egg. - ----- 18.5 ---- diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 8841ee63..0c024f1b 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -2288,7 +2288,6 @@ def _is_unpacked_egg(path): """ return ( path.lower().endswith('.egg') - and os.path.isdir(os.path.join(path, 'EGG-INFO')) ) def _set_parent_ns(packageName): |