From 2aa4a9c95d729ed07f7bb2c0d2632cd7511b2b7e Mon Sep 17 00:00:00 2001 From: Andrew Meleka Date: Fri, 6 Aug 2021 13:18:51 +0200 Subject: [PATCH 1/4] Modify the log line and fix tests --- src/pip/_internal/network/download.py | 7 +------ tests/unit/test_network_download.py | 8 ++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/pip/_internal/network/download.py b/src/pip/_internal/network/download.py index 47af547d6fc..1fa9f857ccb 100644 --- a/src/pip/_internal/network/download.py +++ b/src/pip/_internal/network/download.py @@ -10,7 +10,6 @@ from pip._internal.cli.progress_bars import DownloadProgressProvider from pip._internal.exceptions import NetworkConnectionError -from pip._internal.models.index import PyPI from pip._internal.models.link import Link from pip._internal.network.cache import is_from_cache from pip._internal.network.session import PipSession @@ -34,11 +33,7 @@ def _prepare_download( ) -> Iterable[bytes]: total_length = _get_http_response_size(resp) - if link.netloc == PyPI.file_storage_domain: - url = link.show_url - else: - url = link.url_without_fragment - + url = link.show_url logged_url = redact_auth_from_url(url) if total_length: diff --git a/tests/unit/test_network_download.py b/tests/unit/test_network_download.py index 20f5513a2df..357bb0b2a66 100644 --- a/tests/unit/test_network_download.py +++ b/tests/unit/test_network_download.py @@ -14,17 +14,17 @@ @pytest.mark.parametrize("url, headers, from_cache, expected", [ ('http://example.com/foo.tgz', {}, False, - "Downloading http://example.com/foo.tgz"), + "Downloading foo.tgz"), ('http://example.com/foo.tgz', {'content-length': 2}, False, - "Downloading http://example.com/foo.tgz (2 bytes)"), + "Downloading foo.tgz (2 bytes)"), ('http://example.com/foo.tgz', {'content-length': 2}, True, - "Using cached http://example.com/foo.tgz (2 bytes)"), + "Using cached foo.tgz (2 bytes)"), ('https://files.pythonhosted.org/foo.tgz', {}, False, "Downloading foo.tgz"), ('https://files.pythonhosted.org/foo.tgz', {'content-length': 2}, False, "Downloading foo.tgz (2 bytes)"), ('https://files.pythonhosted.org/foo.tgz', {'content-length': 2}, True, - "Using cached foo.tgz"), + "Using cached foo.tgz (2 bytes)"), ]) def test_prepare_download__log(caplog, url, headers, from_cache, expected): caplog.set_level(logging.INFO) From 9c10c44614d691b8b10b20a8aa61f6b1aab67100 Mon Sep 17 00:00:00 2001 From: Andrew Meleka Date: Fri, 6 Aug 2021 13:21:10 +0200 Subject: [PATCH 2/4] Add author name --- AUTHORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index dff675925a6..c05df884772 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -631,3 +631,4 @@ Zvezdan Petkovic Łukasz Langa Семён Марьясин ‮rekcäH nitraM‮ +Andrew Meleka From bfb6ede8a0610da7eae9aeb4ec5e041134d0237b Mon Sep 17 00:00:00 2001 From: Andrew Meleka Date: Fri, 6 Aug 2021 13:33:13 +0200 Subject: [PATCH 3/4] Add news entry --- news/7390.trivial.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/7390.trivial.rst diff --git a/news/7390.trivial.rst b/news/7390.trivial.rst new file mode 100644 index 00000000000..788c67a7293 --- /dev/null +++ b/news/7390.trivial.rst @@ -0,0 +1 @@ +Enhance the log message while downloading a pip file \ No newline at end of file From dd64fca8e63d3cf9e8251b6e2cc3ab6bfa84dd6c Mon Sep 17 00:00:00 2001 From: Andrew Meleka Date: Fri, 6 Aug 2021 14:57:31 +0200 Subject: [PATCH 4/4] Update AUTHORS.txt --- AUTHORS.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index c05df884772..dff675925a6 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -631,4 +631,3 @@ Zvezdan Petkovic Łukasz Langa Семён Марьясин ‮rekcäH nitraM‮ -Andrew Meleka