Make compatible with requests 2.29.0.

docker · May 2, 2023 · 2c8084e · 2c8084e
1 parent a02ba74
commit 2c8084e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/docker/transport/npipeconn.py b/docker/transport/npipeconn.py
@@ -5,17 +5,17 @@
 from .. import constants
 from .npipesocket import NpipeSocket
 
-import http.client as httplib
-
 try:
     import requests.packages.urllib3 as urllib3
+    import requests.packages.urllib3.connection as urllib3_connection
 except ImportError:
     import urllib3
+    import urllib3.connection as urllib3_connection
 
 RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
 
 
-class NpipeHTTPConnection(httplib.HTTPConnection):
+class NpipeHTTPConnection(urllib3_connection.HTTPConnection):
     def __init__(self, npipe_path, timeout=60):
         super().__init__(
             'localhost', timeout=timeout

diff --git a/docker/transport/sshconn.py b/docker/transport/sshconn.py
@@ -11,12 +11,12 @@
 from docker.transport.basehttpadapter import BaseHTTPAdapter
 from .. import constants
 
-import http.client as httplib
-
 try:
     import requests.packages.urllib3 as urllib3
+    import requests.packages.urllib3.connection as urllib3_connection
 except ImportError:
     import urllib3
+    import urllib3.connection as urllib3_connection
 
 RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
 
@@ -99,7 +99,7 @@ def close(self):
         self.proc.terminate()
 
 
-class SSHConnection(httplib.HTTPConnection):
+class SSHConnection(urllib3_connection.HTTPConnection):
     def __init__(self, ssh_transport=None, timeout=60, host=None):
         super().__init__(
             'localhost', timeout=timeout

diff --git a/docker/transport/unixconn.py b/docker/transport/unixconn.py
@@ -7,14 +7,16 @@
 
 try:
     import requests.packages.urllib3 as urllib3
+    import requests.packages.urllib3.connection as urllib3_connection
 except ImportError:
     import urllib3
+    import urllib3.connection as urllib3_connection
 
 
 RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
 
 
-class UnixHTTPConnection(httplib.HTTPConnection):
+class UnixHTTPConnection(urllib3_connection.HTTPConnection):
 
     def __init__(self, base_url, unix_socket, timeout=60):
         super().__init__(