E58D Make compatible with requests 2.29.0. · docker/docker-py@8291c94 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8291c94

Browse files
felixfonteinfelixfontein
committed
Make compatible with requests 2.29.0.
Signed-off-by: Felix Fontein <felix@fontein.de>
1 parent a02ba74 commit 8291c94

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

‎docker/transport/npipeconn.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
from .. import constants
66
from .npipesocket import NpipeSocket
77

8-
import http.client as httplib
9-
108
try:
119
import requests.packages.urllib3 as urllib3
10+
import requests.packages.urllib3.connection as urllib3_connection
1211
except ImportError:
1312
import urllib3
13+
import urllib3.connection as urllib3_connection
1414

1515
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
1616

1717

18-
class NpipeHTTPConnection(httplib.HTTPConnection):
18+
class NpipeHTTPConnection(urllib3_connection.HTTPConnection):
1919
def __init__(self, npipe_path, timeout=60):
2020
super().__init__(
2121
'localhost', timeout=timeout

‎docker/transport/sshconn.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
from docker.transport.basehttpadapter import BaseHTTPAdapter
1212
from .. import constants
1313

14-
import http.client as httplib
15-
1614
try:
1715
import requests.packages.urllib3 as urllib3
16+
import requests.packages.urllib3.connection as urllib3_connection
1817
except ImportError:
1918
import urllib3
19+
import urllib3.connection as urllib3_connection
2020

2121
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
2222

@@ -99,7 +99,7 @@ def close(self):
9999
self.proc.terminate()
100100

101101

102-
class SSHConnection(httplib.HTTPConnection):
102+
class SSHConnection(urllib3_connection.HTTPConnection):
103103
def __init__(self, ssh_transport=None, timeout=60, host=None):
104104
super().__init__(
105105
'localhost', timeout=timeout

‎docker/transport/unixconn.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77

88
try:
99
import requests.packages.urllib3 as urllib3
10+
import requests.packages.urllib3.connection as urllib3_connection
1011
except ImportError:
1112
import urllib3
13+
import urllib3.connection as urllib3_connection
1214

1315

1416
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
1517

1618

17-
class UnixHTTPConnection(httplib.HTTPConnection):
19+
class UnixHTTPConnection(urllib3_connection.HTTPConnection):
1820

1921
def __init__(self, base_url, unix_socket, timeout=60):
2022
super().__init__(

0 commit comments

Comments
 (0)
0