From 8189636d72de66c84922d9cf508185d040c4e69e Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Tue, 18 May 2021 22:31:19 -0500 Subject: [PATCH] I guess VerifiedHTTPSConnection is required --- src/urllib3/connectionpool.py | 8 ++++---- src/urllib3/poolmanager.py | 2 +- src/urllib3/request.py | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/urllib3/connectionpool.py b/src/urllib3/connectionpool.py index 5b068de514..7ebcda8d2d 100644 --- a/src/urllib3/connectionpool.py +++ b/src/urllib3/connectionpool.py @@ -44,13 +44,13 @@ from .util.request import set_file_position from .util.response import assert_header_parsing from .util.retry import Retry +from .util.ssl_ import _TYPE_TLS_VERSION from .util.ssl_match_hostname import CertificateError from .util.timeout import Timeout from .util.url import Url, _encode_target from .util.url import _normalize_host as normalize_host from .util.url import parse_url from .util.util import to_str -from .util.ssl_ import _TYPE_TLS_VERSION if TYPE_CHECKING: @@ -897,8 +897,8 @@ def __init__( key_password: Optional[str] = None, ca_certs: Optional[str] = None, ssl_version: Optional[Union[int, str]] = None, - ssl_minimum_version: Optional[_TYPE_TLS_VERSION]=None, - ssl_maximum_version: Optional[_TYPE_TLS_VERSION]=None, + ssl_minimum_version: Optional[_TYPE_TLS_VERSION] = None, + ssl_maximum_version: Optional[_TYPE_TLS_VERSION] = None, assert_hostname: Optional[Union[str, "Literal[False]"]] = None, assert_fingerprint: Optional[str] = None, ca_cert_dir: Optional[str] = None, @@ -936,7 +936,7 @@ def _prepare_conn(self, conn: HTTPSConnection) -> HTTPConnection: and establish the tunnel if proxy is used. """ - if isinstance(conn, HTTPSConnection): + if isinstance(conn, VerifiedHTTPSConnection): conn.set_cert( key_file=self.key_file, key_password=self.key_password, diff --git a/src/urllib3/poolmanager.py b/src/urllib3/poolmanager.py index ffc5e88589..ffeeb166f3 100644 --- a/src/urllib3/poolmanager.py +++ b/src/urllib3/poolmanager.py @@ -33,9 +33,9 @@ from .util.connection import SocketOptions from .util.proxy import connection_requires_http_tunnel from .util.retry import Retry +from .util.ssl_ import _TYPE_TLS_VERSION from .util.timeout import Timeout from .util.url import Url, parse_url -from .util.ssl_ import _TYPE_TLS_VERSION if TYPE_CHECKING: import ssl diff --git a/src/urllib3/request.py b/src/urllib3/request.py index 8cd2affaa3..f3e1a03df0 100644 --- a/src/urllib3/request.py +++ b/src/urllib3/request.py @@ -68,7 +68,6 @@ def request( body: Optional[HTTPBody] = None, fields: Optional[_TYPE_FIELDS] = None, headers: Optional[Mapping[str, str]] = None, - body: Optional[HTTPBody] = None, **urlopen_kw: Any, ) -> BaseHTTPResponse: """