From e6d7c40652743005e70ddec1a3e5c7466e52a313 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 1 Oct 2016 11:59:36 -0400 Subject: Disable nspkg.pth behavior on Python 3.3+. Fixes #805 and fixes pypa/pip#1924. --- setuptools/command/install_egg_info.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setuptools/command/install_egg_info.py') 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)", -- cgit v1.2.1