From 8aa5feac57563e7235d13c473e54f174fadd1ee6 Mon Sep 17 00:00:00 2001 From: Matt Gilson Date: Thu, 22 Nov 2018 06:06:58 -0500 Subject: [PATCH] Update types for requests.adapters (#2614) --- third_party/2and3/requests/adapters.pyi | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/third_party/2and3/requests/adapters.pyi b/third_party/2and3/requests/adapters.pyi index fe7e1162b..d92c21d42 100644 --- a/third_party/2and3/requests/adapters.pyi +++ b/third_party/2and3/requests/adapters.pyi @@ -1,6 +1,6 @@ # Stubs for requests.adapters (Python 3) -from typing import Any, Container, Union, Text, Tuple +from typing import Any, Container, Union, Text, Tuple, Optional, Mapping from . import models from .packages.urllib3 import poolmanager from .packages.urllib3 import response @@ -44,12 +44,15 @@ DEFAULT_RETRIES = ... # type: Any class BaseAdapter: def __init__(self) -> None: ... - def send(self, request: PreparedRequest, stream: bool = ..., + def send(self, + request: PreparedRequest, + stream: bool = ..., timeout: Union[None, float, Tuple[float, float]] = ..., - verify: bool = ..., - cert: Union[None, Union[bytes, Text], Container[Union[bytes, Text]]] = ... - ) -> Response: ... + verify: Union[bool, str] = ..., + cert: Union[None, Union[bytes, Text], Container[Union[bytes, Text]]] = ..., + proxies: Optional[Mapping[str, str]] = ...) -> Response: ... def close(self) -> None: ... + class HTTPAdapter(BaseAdapter): __attrs__ = ... # type: Any max_retries = ... # type: Any @@ -67,6 +70,10 @@ class HTTPAdapter(BaseAdapter): def request_url(self, request, proxies): ... def add_headers(self, request, **kwargs): ... def proxy_headers(self, proxy): ... - # TODO: "request" is not actually optional, modified to please mypy. - def send(self, request=..., stream=..., timeout=..., verify=..., cert=..., - proxies=...): ... + def send(self, + request: PreparedRequest, + stream: bool = ..., + timeout: Union[None, float, Tuple[float, float]] = ..., + verify: Union[bool, str] = ..., + cert: Union[None, Union[bytes, Text], Container[Union[bytes, Text]]] = ..., + proxies: Optional[Mapping[str, str]] = ...) -> Response: ...