From: DongHun Kwak <dh0128.kwak@samsung.com>
Date: Tue, 29 Dec 2020 22:06:20 +0000 (+0900)
Subject: Imported Upstream version 47.1.0
X-Git-Tag: upstream/47.1.0^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8be707b9c23cea1d521bd08bee57b02485c4622;p=platform%2Fupstream%2Fpython-setuptools.git

Imported Upstream version 47.1.0
---

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 2639380..1fa442e 100644
--- 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 db1c67f..dbade95 100644
--- 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 ed31c45..c8f72e9 100644
--- 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 ec1106a..ca09bd1 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):