8000 Simplify imports since requests >= 2.16.0 no longer uses vendored url… · docker/docker-py@32fdf99 · GitHub
[go: up one dir, main page]
Skip to content

Commit 32fdf99

Browse files
felixfonteinfelixfontein
committed
Simplify imports since requests >= 2.16.0 no longer uses vendored urllib3.
1 parent 8291c94 commit 32fdf99

File tree

6 files changed

+12
-30
lines changed

6 files changed

+12
-30
lines changed

‎docker/transport/npipeconn.py‎

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

8-
try:
9-
import requests.packages.urllib3 as urllib3
10-
import requests.packages.urllib3.connection as urllib3_connection
11-
except ImportError:
12-
import urllib3
13-
import urllib3.connection as urllib3_connection
8+
import urllib3
9+
import urllib3.connection
1410

1511
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
1612

1713

18-
class NpipeHTTPConnection(urllib3_connection.HTTPConnection):
14+
class NpipeHTTPConnection(urllib3.connection.HTTPConnection):
1915
def __init__(self, npipe_path, timeout=60):
2016
super().__init__(
2117
'localhost', timeout=timeout

‎docker/transport/sshconn.py‎

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

14-
try:
15-
import requests.packages.urllib3 as urllib3
16-
import requests.packages.urllib3.connection as urllib3_connection
17-
except ImportError:
18-
import urllib3
19-
import urllib3.connection as urllib3_connection
14+
import urllib3
15+
import urllib3.connection
2016

2117
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
2218

@@ -99,7 +95,7 @@ def close(self):
9995
self.proc.terminate()
10096

10197

102-
class SSHConnection(urllib3_connection.HTTPConnection):
98+
class SSHConnection(urllib3.connection.HTTPConnection):
10399
def __init__(self, ssh_transport=None, timeout=60, host=None):
104100
super().__init__(
105101
'localhost', timeout=timeout

‎docker/transport/ssladapter.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77

88
from docker.transport.basehttpadapter import BaseHTTPAdapter
99

10-
try:
11-
import requests.packages.urllib3 as urllib3
12-
except ImportError:
13-
import urllib3
10+
import urllib3
1411

1512

1613
PoolManager = urllib3.poolmanager.PoolManager

‎docker/transport/unixconn.py‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,14 @@
55
from docker.transport.basehttpadapter import BaseHTTPAdapter
66
from .. import constants
77

8-
try:
9-
import requests.packages.urllib3 as urllib3
10-
import requests.packages.urllib3.connection as urllib3_connection
11-
except ImportError:
12-
import urllib3
13-
import urllib3.connection as urllib3_connection
8+
import urllib3
9+
import urllib3.connection
1410

1511

1612
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
1713

1814

19-
class UnixHTTPConnection(urllib3_connection.HTTPConnection):
15+
class UnixHTTPConnection(urllib3.connection.HTTPConnection):
2016

2117
def __init__(self, base_url, unix_socket, timeout=60):
2218
super().__init__(

‎docker/types/daemon.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import socket
22

3-
try:
4-
import requests.packages.urllib3 as urllib3
5-
except ImportError:
6-
import urllib3
3+
import urllib3
74

85
from ..errors import DockerException
96

‎tests/unit/api_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import docker
1717
import pytest
1818
import requests
19+
import urllib3
1920
from docker.api import APIClient
2021
from docker.constants import DEFAULT_DOCKER_API_VERSION
21-
from requests.packages import urllib3
2222
from unittest import mock
2323

2424
from . import fake_api

0 commit comments

Comments
 (0)
0