Imported Upstream version 47.1.0

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2639380ecb9dff20e448c7e66f073ed05f99e14a..1fa442e2808afbdf94345767a90a26a432ac0623 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 47.0.0
+current_version = 47.1.0
 commit = True
 tag = True
 

diff --git a/CHANGES.rst b/CHANGES.rst
index db1c67f71d28c471d394362e27d578da0ab91f2d..dbade950815e7da14f995c2a5cdf4dfef77c2aae 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v47.1.0
+-------
+
+* #2070: In wheel-to-egg conversion, use simple pkg_resources-style namespace declaration for packages that declare namespace_packages.
+
+
 v47.0.0
 -------
 

diff --git a/setup.cfg b/setup.cfg
index ed31c45037178af53d9591c29e48ba20fa8c3b0e..c8f72e97cfad287da6ac0815e8923a2265b5df61 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ formats = zip
 
 [metadata]
 name = setuptools
-version = 47.0.0
+version = 47.1.0
 description = Easily download, build, install, upgrade, and uninstall Python packages
 author = Python Packaging Authority
 author_email = distutils-sig@python.org

diff --git a/setuptools/wheel.py b/setuptools/wheel.py
index ec1106a7b28a486cd61db74778dfd486209edb05..ca09bd194467b2b33b3b57dc8edd4e090b73e4b1 100644 (file)
--- 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):