From 7c18349b2b6b9625a2d56fd8f080dce1809b1bdf Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 30 Dec 2020 07:03:46 +0900 Subject: [PATCH] Imported Upstream version 40.7.2 --- CHANGES.rst | 6 ++++++ setup.cfg | 2 +- setup.py | 2 +- setuptools/package_index.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 79ebe16..7d1353b 100644 --- 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 c934e2f..16db122 100644 --- 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 9e50513..a009f17 100755 --- 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 7e9517c..ea76c00 100644 --- 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) -- 2.7.4