From e4a7edb949e0b920b16f61aeeb19fc3d328f3012 Mon Sep 17 00:00:00 2001 From: Matthias Kramm Date: Mon, 12 Oct 2015 15:27:37 -0700 Subject: [PATCH] Apply urllib3 fix from JukkaL --- .../3/requests/packages/urllib3/connectionpool.pyi | 10 ++++++---- third_party/3/requests/packages/urllib3/response.pyi | 4 +--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/third_party/3/requests/packages/urllib3/connectionpool.pyi b/third_party/3/requests/packages/urllib3/connectionpool.pyi index 1bbeb0547..bdbebd945 100644 --- a/third_party/3/requests/packages/urllib3/connectionpool.pyi +++ b/third_party/3/requests/packages/urllib3/connectionpool.pyi @@ -6,9 +6,14 @@ from typing import Any from . import exceptions from .packages import ssl_match_hostname from . import packages -from . import connection +from .connection import ( + HTTPException as HTTPException, + BaseSSLError as BaseSSLError, + ConnectionError as ConnectionError, +) from . import request from . import response +from . import connection from .util import connection as _connection from .util import retry from .util import timeout @@ -31,9 +36,6 @@ DummyConnection = connection.DummyConnection HTTPConnection = connection.HTTPConnection HTTPSConnection = connection.HTTPSConnection VerifiedHTTPSConnection = connection.VerifiedHTTPSConnection -HTTPException = connection.HTTPException -BaseSSLError = connection.BaseSSLError -ConnectionError = connection.ConnectionError RequestMethods = request.RequestMethods HTTPResponse = response.HTTPResponse is_connection_dropped = _connection.is_connection_dropped diff --git a/third_party/3/requests/packages/urllib3/response.pyi b/third_party/3/requests/packages/urllib3/response.pyi index 586a08208..0e58ec234 100644 --- a/third_party/3/requests/packages/urllib3/response.pyi +++ b/third_party/3/requests/packages/urllib3/response.pyi @@ -7,7 +7,7 @@ import io from . import _collections from . import exceptions #from .packages import six -from . import connection +from .connection import HTTPException as HTTPException, BaseSSLError as BaseSSLError from .util import response HTTPHeaderDict = _collections.HTTPHeaderDict @@ -16,8 +16,6 @@ DecodeError = exceptions.DecodeError ReadTimeoutError = exceptions.ReadTimeoutError binary_type = bytes # six.binary_type PY3 = True # six.PY3 -HTTPException = connection.HTTPException -BaseSSLError = connection.BaseSSLError is_fp_closed = response.is_fp_closed class DeflateDecoder: