diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-10-01 11:59:36 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-10-01 11:59:36 -0400 |
| commit | e6d7c40652743005e70ddec1a3e5c7466e52a313 (patch) | |
| tree | 1f6836e8b8464144b7c4738de4a5c411410840b5 | |
| parent | ae50b560c46773697f0f3894ac34de37fda2fadd (diff) | |
| download | python-setuptools-git-e6d7c40652743005e70ddec1a3e5c7466e52a313.tar.gz | |
Disable nspkg.pth behavior on Python 3.3+. Fixes #805 and fixes pypa/pip#1924.
| -rw-r--r-- | CHANGES.rst | 6 | ||||
| -rwxr-xr-x | setuptools/command/install_egg_info.py | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 7c4ff813..c536a7be 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,12 @@ CHANGES ======= +v28.1.0 +------- + +* #805: Disable ``-nspkg.pth`` behavior on Python 3.3+ where + PEP-420 functionality is adequate. Fixes pip #1924. + v28.0.0 ------- diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py index 60b615d2..7834e107 100755 --- a/setuptools/command/install_egg_info.py +++ b/setuptools/command/install_egg_info.py @@ -82,9 +82,10 @@ class install_egg_info(Command): _nspkg_tmpl = ( "import sys, types, os", + "pep420 = sys.version_info > (3, 3)", "p = os.path.join(sys._getframe(1).f_locals['sitedir'], *%(pth)r)", "ie = os.path.exists(os.path.join(p,'__init__.py'))", - "m = not ie and " + "m = not ie and not pep420 and " "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))", "mp = (m or []) and m.__dict__.setdefault('__path__',[])", "(p not in mp) and mp.append(p)", |