docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: compatiblity with requests ≥ 2.29.0 and urllib3 2.x (#3116) 

Requirements are the same, so it's still possible to use `urllib3 < 2`
or `requests == 2.28.2` for example.

Signed-off-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
Felix Fontein 2023-05-05 17:39:31 +02:00 committed by GitHub
parent a02ba74333
commit 3178c8d48b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/transport/npipeconn.py
View File

@ -5,17 +5,13 @@ from docker.transport.basehttpadapter import BaseHTTPAdapter
from .. import constants from .. import constants
from .npipesocket import NpipeSocket from .npipesocket import NpipeSocket
import http.client as httplib
try:
import requests.packages.urllib3 as urllib3
except ImportError:
import urllib3 import urllib3
import urllib3.connection
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
class NpipeHTTPConnection(httplib.HTTPConnection): class NpipeHTTPConnection(urllib3.connection.HTTPConnection):
def __init__(self, npipe_path, timeout=60): def __init__(self, npipe_path, timeout=60):
super().__init__( super().__init__(
'localhost', timeout=timeout 'localhost', timeout=timeout

8
docker/transport/sshconn.py
View File

@ -11,12 +11,8 @@ import subprocess
from docker.transport.basehttpadapter import BaseHTTPAdapter from docker.transport.basehttpadapter import BaseHTTPAdapter
from .. import constants from .. import constants
import http.client as httplib
try:
import requests.packages.urllib3 as urllib3
except ImportError:
import urllib3 import urllib3
import urllib3.connection
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
@ -99,7 +95,7 @@ class SSHSocket(socket.socket):
self.proc.terminate() self.proc.terminate()
class SSHConnection(httplib.HTTPConnection): class SSHConnection(urllib3.connection.HTTPConnection):
def __init__(self, ssh_transport=None, timeout=60, host=None): def __init__(self, ssh_transport=None, timeout=60, host=None):
super().__init__( super().__init__(
'localhost', timeout=timeout 'localhost', timeout=timeout

3
docker/transport/ssladapter.py
View File

@ -7,9 +7,6 @@ from requests.adapters import HTTPAdapter
from docker.transport.basehttpadapter import BaseHTTPAdapter from docker.transport.basehttpadapter import BaseHTTPAdapter
try:
import requests.packages.urllib3 as urllib3
except ImportError:
import urllib3 import urllib3

13
docker/transport/unixconn.py
View File

@ -1,20 +1,17 @@
import requests.adapters import requests.adapters
import socket import socket
import http.client as httplib
from docker.transport.basehttpadapter import BaseHTTPAdapter from docker.transport.basehttpadapter import BaseHTTPAdapter
from .. import constants from .. import constants
try:
import requests.packages.urllib3 as urllib3
except ImportError:
import urllib3 import urllib3
import urllib3.connection
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
class UnixHTTPConnection(httplib.HTTPConnection): class UnixHTTPConnection(urllib3.connection.HTTPConnection):
def __init__(self, base_url, unix_socket, timeout=60): def __init__(self, base_url, unix_socket, timeout=60):
super().__init__( super().__init__(
@ -30,12 +27,6 @@ class UnixHTTPConnection(httplib.HTTPConnection):
sock.connect(self.unix_socket) sock.connect(self.unix_socket)
self.sock = sock self.sock = sock
def putheader(self, header, *values):
super().putheader(header, *values)
def response_class(self, sock, *args, **kwargs):
return httplib.HTTPResponse(sock, *args, **kwargs)
class UnixHTTPConnectionPool(urllib3.connectionpool.HTTPConnectionPool): class UnixHTTPConnectionPool(urllib3.connectionpool.HTTPConnectionPool):
def __init__(self, base_url, socket_path, timeout=60, maxsize=10): def __init__(self, base_url, socket_path, timeout=60, maxsize=10):

3
docker/types/daemon.py
View File

@ -1,8 +1,5 @@
import socket import socket
try:
import requests.packages.urllib3 as urllib3
except ImportError:
import urllib3 import urllib3
from ..errors import DockerException from ..errors import DockerException

2
tests/unit/api_test.py
View File

@ -16,9 +16,9 @@ import http.server
import docker import docker
import pytest import pytest
import requests import requests
import urllib3
from docker.api import APIClient from docker.api import APIClient
from docker.constants import DEFAULT_DOCKER_API_VERSION from docker.constants import DEFAULT_DOCKER_API_VERSION
from requests.packages import urllib3
from unittest import mock from unittest import mock
from . import fake_api from . import fake_api