aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-05-28 07:54:35 -0400
committerJason R. Coombs <jaraco@jaraco.com>2020-05-28 07:54:35 -0400
commit3b32ab28d78eb38f681d36ecef505a65d1cbad38 (patch)
tree745044e9264edaa925704d4c567838e51a8f5a76
parent7339f2c1cea8fa5275b699f494300a309d58c580 (diff)
downloadexternal_python_setuptools-3b32ab28d78eb38f681d36ecef505a65d1cbad38.tar.gz
external_python_setuptools-3b32ab28d78eb38f681d36ecef505a65d1cbad38.tar.bz2
external_python_setuptools-3b32ab28d78eb38f681d36ecef505a65d1cbad38.zip
In wheel-to-egg conversion, use simple pkg_resources-style namespace declaration for packages that declare namespace_packages. Fixes #2070.
-rw-r--r--setuptools/wheel.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index ec1106a7..ca09bd19 100644
--- a/setuptools/wheel.py
+++ b/setuptools/wheel.py
@@ -27,12 +27,8 @@ WHEEL_NAME = re.compile(
)\.whl$""",
re.VERBOSE).match
-NAMESPACE_PACKAGE_INIT = '''\
-try:
- __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
- __path__ = __import__('pkgutil').extend_path(__path__, __name__)
-'''
+NAMESPACE_PACKAGE_INIT = \
+ "__import__('pkg_resources').declare_namespace(__name__)\n"
def unpack(src_dir, dst_dir):