diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-10-07 08:22:59 -0700 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-10-07 08:22:59 -0700 |
| commit | 3660b258d084b47751f0fdb3b33090276059e8cb (patch) | |
| tree | 98f5d791455c1fa5dc8d17f6b4eeec003fd2eeeb /setuptools | |
| parent | 6e61c13148641c695c53434654be7d9f09a04e65 (diff) | |
| parent | 4893826a79d5155205fb557ab032fc989629db6b (diff) | |
| download | python-setuptools-git-3660b258d084b47751f0fdb3b33090276059e8cb.tar.gz | |
Merge suppression of namespace handling when PEP-420 can handle namespace packages.
Diffstat (limited to 'setuptools')
| -rwxr-xr-x | setuptools/command/install_egg_info.py | 3 |
1 files changed, 2 insertions, 1 deletions
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)", |