diff --git a/news/7390.trivial.rst b/news/7390.trivial.rst new file mode 100644 index 00000000000..fd79119d6e7 --- /dev/null +++ b/news/7390.trivial.rst @@ -0,0 +1 @@ +Standardize ``Link`` representation in logs. diff --git a/src/pip/_internal/index/collector.py b/src/pip/_internal/index/collector.py index e6e9469af1a..a790d365974 100644 --- a/src/pip/_internal/index/collector.py +++ b/src/pip/_internal/index/collector.py @@ -424,7 +424,10 @@ def _handle_get_page_fail( ) -> None: if meth is None: meth = logger.debug - meth("Could not fetch URL %s: %s - skipping", link, reason) + url = str(link) + if logger.getEffectiveLevel() > logging.DEBUG: + url = link.show_url + meth("Could not fetch URL %s: %s - skipping", url, reason) def _make_html_page(response: Response, cache_link_parsing: bool = True) -> HTMLPage: diff --git a/src/pip/_internal/network/download.py b/src/pip/_internal/network/download.py index 35bc970e260..5ba91ce550e 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 get_download_progress_renderer 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: @@ -170,7 +165,7 @@ def __call__( logger.critical( "HTTP error %s while getting %s", e.response.status_code, - link, + link.show_url, ) raise diff --git a/tests/unit/test_network_download.py b/tests/unit/test_network_download.py index 53200f2e511..ca47b116460 100644 --- a/tests/unit/test_network_download.py +++ b/tests/unit/test_network_download.py @@ -20,19 +20,19 @@ "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"), (