Use bare string proxies parameter for httpx<0.28 (#17113)

jupyterlab · Dec 21, 2024 · 3f3d807 · 3f3d807
1 parent 80e4de7
commit 3f3d807
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/jupyterlab/extensions/pypi.py b/jupyterlab/extensions/pypi.py
@@ -62,21 +62,26 @@ def make_connection(self, host):
 _httpx_version = Version(httpx.__version__)
 _httpx_client_args = {}
 
-proxies = None
 xmlrpc_transport_override = None
 
 if http_proxy_url:
     http_proxy = urlparse(http_proxy_url)
     proxy_host, _, proxy_port = http_proxy.netloc.partition(":")
 
-    proxies = {
-        "http://": httpx.AsyncHTTPTransport(proxy=http_proxy_url),
-        "https://": httpx.AsyncHTTPTransport(proxy=https_proxy_url),
-    }
-
-    _httpx_client_args = {
-        ("mounts" if _httpx_version >= Version("0.28.0") else "proxies"): proxies,
-    }
+    if _httpx_version >= Version("0.28.0"):
+        _httpx_client_args = {
+            "mounts": {
+                "http://": httpx.AsyncHTTPTransport(proxy=http_proxy_url),
+                "https://": httpx.AsyncHTTPTransport(proxy=https_proxy_url),
+            }
+        }
+    else:
+        _httpx_client_args = {
+            "proxies": {
+                "http://": http_proxy_url,
+                "https://": https_proxy_url,
+            }
+        }
 
     xmlrpc_transport_override = ProxiedTransport()
     xmlrpc_transport_override.set_proxy(proxy_host, proxy_port)