Imported Upstream version 40.7.2

diff --git a/CHANGES.rst b/CHANGES.rst
index 79ebe165332456131f91d39158861e34663a7f81..7d1353b4d1d4a0ca73c68776e65f8d96bd1a9f8e 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.7.2
+-------
+
+* #1666: Restore port in URL handling in package_index.
+
+
 v40.7.1
 -------
 

diff --git a/setup.cfg b/setup.cfg
index c934e2f4840fe72953074e4618dbf709ce9f1598..16db122160c35a90fe7b95bb608f81a4f8a107e3 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.7.1
+current_version = 40.7.2
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
index 9e50513b47b6c0f82756b9603efbd1203562ef90..a009f1791805bff469577fdcbc5d25b88a5e8699 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.7.1",
+    version="40.7.2",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 7e9517cefadb864ab2c0b69d66c78ad7d4d62c42..ea76c005025e3dde9bb59badebb80ee8f68a9019 100644 (file)
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -1072,7 +1072,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
 
     if auth:
         auth = "Basic " + _encode_auth(auth)
-        parts = scheme, parsed.hostname, path, params, query, frag
+        parts = scheme, netloc, path, params, query, frag
         new_url = urllib.parse.urlunparse(parts)
         request = urllib.request.Request(new_url)
         request.add_header("Authorization", auth)