Use types-urllib3 for requests (#6859)

Author: srittau

stubs/requests/@tests/stubtest_allowlist.txt

@@ -28,63 +28,6 @@ requests.models.RequestField.__init__
 requests.models.RequestField.from_tuples
 requests.options
 requests.packages.VendorAlias
-requests.packages.urllib3.HTTPConnectionPool.__init__
-requests.packages.urllib3.HTTPConnectionPool.urlopen
-requests.packages.urllib3.HTTPResponse.__init__
-requests.packages.urllib3.HTTPSConnectionPool.__init__
-requests.packages.urllib3.NullHandler
-requests.packages.urllib3.PoolManager.connection_from_host
-requests.packages.urllib3.PoolManager.connection_from_url
-requests.packages.urllib3.PoolManager.urlopen
-requests.packages.urllib3.ProxyManager.__init__
-requests.packages.urllib3.ProxyManager.connection_from_host
-requests.packages.urllib3.ProxyManager.urlopen
-requests.packages.urllib3.Retry.is_forced_retry
-requests.packages.urllib3.Retry.sleep
-requests.packages.urllib3._collections.HTTPHeaderDict.from_httplib
-requests.packages.urllib3._collections.HTTPHeaderDict.getlist
-requests.packages.urllib3._collections.RLock
-requests.packages.urllib3.connection.HTTPConnection.request
-requests.packages.urllib3.connection.HTTPSConnection.__init__
-requests.packages.urllib3.connection.VerifiedHTTPSConnection.__init__
-requests.packages.urllib3.connection.VerifiedHTTPSConnection.set_cert
-requests.packages.urllib3.connectionpool.ConnectionError
-requests.packages.urllib3.connectionpool.HTTPConnection.request
-requests.packages.urllib3.connectionpool.HTTPConnectionPool.__init__
-requests.packages.urllib3.connectionpool.HTTPConnectionPool.urlopen
-requests.packages.urllib3.connectionpool.HTTPResponse.__init__
-requests.packages.urllib3.connectionpool.HTTPSConnection.__init__
-requests.packages.urllib3.connectionpool.HTTPSConnectionPool.__init__
-requests.packages.urllib3.connectionpool.ProxyError.__init__
-requests.packages.urllib3.connectionpool.RequestMethods.request_encode_url
-requests.packages.urllib3.connectionpool.Retry.is_forced_retry
-requests.packages.urllib3.connectionpool.Retry.sleep
-requests.packages.urllib3.connectionpool.VerifiedHTTPSConnection.__init__
-requests.packages.urllib3.connectionpool.VerifiedHTTPSConnection.set_cert
-requests.packages.urllib3.exceptions.ProxyError.__init__
-requests.packages.urllib3.fields.RequestField.__init__
-requests.packages.urllib3.fields.RequestField.from_tuples
-requests.packages.urllib3.filepost.RequestField.__init__
-requests.packages.urllib3.filepost.RequestField.from_tuples
-requests.packages.urllib3.poolmanager.PoolManager.connection_from_host
-requests.packages.urllib3.poolmanager.PoolManager.connection_from_url
-requests.packages.urllib3.poolmanager.PoolManager.urlopen
-requests.packages.urllib3.poolmanager.ProxyManager.__init__
-requests.packages.urllib3.poolmanager.ProxyManager.connection_from_host
-requests.packages.urllib3.poolmanager.ProxyManager.urlopen
-requests.packages.urllib3.request.RequestMethods.request_encode_url
-requests.packages.urllib3.response.HTTPHeaderDict.from_httplib
-requests.packages.urllib3.response.HTTPHeaderDict.getlist
-requests.packages.urllib3.response.HTTPResponse.__init__
-requests.packages.urllib3.response.PY3
-requests.packages.urllib3.util.Retry.is_forced_retry
-requests.packages.urllib3.util.Retry.sleep
-requests.packages.urllib3.util.connection.poll
-requests.packages.urllib3.util.connection.select
-requests.packages.urllib3.util.retry.Retry.is_forced_retry
-requests.packages.urllib3.util.retry.Retry.sleep
-requests.packages.urllib3.util.ssl_.create_default_context
-requests.packages.urllib3.util.ssl_.ssl_wrap_socket
 requests.patch
 requests.post
 requests.put

stubs/requests/METADATA.toml

@@ -1,2 +1,3 @@
 version = "2.27.*"
+requires = ["types-urllib3<1.27"] # keep in sync with requests's setup.py
 python2 = true

stubs/requests/requests/adapters.pyi

@@ -1,8 +1,9 @@
 from typing import Any, Container, Mapping, Text
 
+from urllib3 import exceptions as urllib3_exceptions, poolmanager, response
+from urllib3.util import retry
+
 from . import cookies, exceptions, models, structures, utils
-from .packages.urllib3 import exceptions as urllib3_exceptions, poolmanager, response
-from .packages.urllib3.util import retry
 
 PreparedRequest = models.PreparedRequest
 Response = models.Response

stubs/requests/requests/exceptions.pyi

@@ -1,6 +1,6 @@
 from typing import Any
 
-from .packages.urllib3.exceptions import HTTPError as BaseHTTPError
+from urllib3.exceptions import HTTPError as BaseHTTPError
 
 class RequestException(IOError):
     response: Any

stubs/requests/requests/models.pyi

@@ -2,9 +2,10 @@ import datetime
 from json import JSONDecoder
 from typing import Any, Callable, Iterator, Text, Type, TypeVar
 
+from urllib3 import exceptions as urllib3_exceptions, fields, filepost, util
+
 from . import auth, cookies, exceptions, hooks, status_codes, structures, utils
 from .cookies import RequestsCookieJar
-from .packages.urllib3 import exceptions as urllib3_exceptions, fields, filepost, util
 
 _VT = TypeVar("_VT")
 

stubs/requests/requests/packages/__init__.pyi

@@ -1,3 +1,5 @@
+# requests also imports urllib3 as requests.packages.urllib3, the stubs don't reflect that.
+
 class VendorAlias:
     def __init__(self, package_names) -> None: ...
     def find_module(self, fullname, path=...): ...