From 3e88363b34f916ab816c3f7ed5a79c1620f9deee Mon Sep 17 00:00:00 2001
From: Kevin Kirsche <kevin.kirsche@one.verizon.com>
Date: Fri, 5 Aug 2022 07:46:07 -0400
Subject: [PATCH] `requests.adapters`: use re-exports rather than assignments
 (#8485)

---
 .../requests/@tests/requirements-stubtest.txt |  1 +
 stubs/requests/requests/adapters.pyi          | 60 ++++++++++---------
 2 files changed, 32 insertions(+), 29 deletions(-)
 create mode 100644 stubs/requests/@tests/requirements-stubtest.txt

diff --git a/stubs/requests/@tests/requirements-stubtest.txt b/stubs/requests/@tests/requirements-stubtest.txt
new file mode 100644
index 000000000..60f2f370a
--- /dev/null
+++ b/stubs/requests/@tests/requirements-stubtest.txt
@@ -0,0 +1 @@
+PySocks>=1.5.6, !=1.5.7
diff --git a/stubs/requests/requests/adapters.pyi b/stubs/requests/requests/adapters.pyi
index 8198d2b9a..dbdd59f70 100644
--- a/stubs/requests/requests/adapters.pyi
+++ b/stubs/requests/requests/adapters.pyi
@@ -1,34 +1,36 @@
 from collections.abc import Mapping
 from typing import Any
 
-from urllib3 import exceptions as urllib3_exceptions, poolmanager, response
-from urllib3.util import retry
+from urllib3.contrib.socks import SOCKSProxyManager as SOCKSProxyManager
+from urllib3.exceptions import (
+    ConnectTimeoutError as ConnectTimeoutError,
+    MaxRetryError as MaxRetryError,
+    ProtocolError as ProtocolError,
+    ReadTimeoutError as ReadTimeoutError,
+    ResponseError as ResponseError,
+)
+from urllib3.poolmanager import PoolManager as PoolManager, proxy_from_url as proxy_from_url
+from urllib3.response import HTTPResponse as HTTPResponse
+from urllib3.util.retry import Retry as Retry
 
-from . import cookies, exceptions, models, structures, utils
-
-Response = models.Response
-PoolManager = poolmanager.PoolManager
-proxy_from_url = poolmanager.proxy_from_url
-HTTPResponse = response.HTTPResponse
-Retry = retry.Retry
-DEFAULT_CA_BUNDLE_PATH = utils.DEFAULT_CA_BUNDLE_PATH
-get_encoding_from_headers = utils.get_encoding_from_headers
-prepend_scheme_if_needed = utils.prepend_scheme_if_needed
-get_auth_from_url = utils.get_auth_from_url
-urldefragauth = utils.urldefragauth
-CaseInsensitiveDict = structures.CaseInsensitiveDict
-ConnectTimeoutError = urllib3_exceptions.ConnectTimeoutError
-MaxRetryError = urllib3_exceptions.MaxRetryError
-ProtocolError = urllib3_exceptions.ProtocolError
-ReadTimeoutError = urllib3_exceptions.ReadTimeoutError
-ResponseError = urllib3_exceptions.ResponseError
-extract_cookies_to_jar = cookies.extract_cookies_to_jar
-ConnectionError = exceptions.ConnectionError
-ConnectTimeout = exceptions.ConnectTimeout
-ReadTimeout = exceptions.ReadTimeout
-SSLError = exceptions.SSLError
-ProxyError = exceptions.ProxyError
-RetryError = exceptions.RetryError
+from .cookies import extract_cookies_to_jar as extract_cookies_to_jar
+from .exceptions import (
+    ConnectionError as ConnectionError,
+    ConnectTimeout as ConnectTimeout,
+    ProxyError as ProxyError,
+    ReadTimeout as ReadTimeout,
+    RetryError as RetryError,
+    SSLError as SSLError,
+)
+from .models import PreparedRequest, Response as Response
+from .structures import CaseInsensitiveDict as CaseInsensitiveDict
+from .utils import (
+    DEFAULT_CA_BUNDLE_PATH as DEFAULT_CA_BUNDLE_PATH,
+    get_auth_from_url as get_auth_from_url,
+    get_encoding_from_headers as get_encoding_from_headers,
+    prepend_scheme_if_needed as prepend_scheme_if_needed,
+    urldefragauth as urldefragauth,
+)
 
 DEFAULT_POOLBLOCK: bool
 DEFAULT_POOLSIZE: int
@@ -39,7 +41,7 @@ class BaseAdapter:
     def __init__(self) -> None: ...
     def send(
         self,
-        request: models.PreparedRequest,
+        request: PreparedRequest,
         stream: bool = ...,
         timeout: None | float | tuple[float, float] | tuple[float, None] = ...,
         verify: bool | str = ...,
@@ -68,7 +70,7 @@ class HTTPAdapter(BaseAdapter):
     def proxy_headers(self, proxy): ...
     def send(
         self,
-        request: models.PreparedRequest,
+        request: PreparedRequest,
         stream: bool = ...,
         timeout: None | float | tuple[float, float] | tuple[float, None] = ...,
         verify: bool | str = ...,