From db2aecbac85564b6a2ed77b5a6657cbbfa3b57c7 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 12 Mar 2018 12:52:08 -0400 Subject: [PATCH] -> types.Response --- requests/api.py | 18 +++++++++--------- requests/basics.py | 1 + requests/types.py | 3 ++- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/requests/api.py b/requests/api.py index b02834b1..3b346b3a 100644 --- a/requests/api.py +++ b/requests/api.py @@ -11,9 +11,9 @@ This module implements the Requests API. """ from . import sessions +from . import types - -def request(method, url, session=None, **kwargs): +def request(method: types.Method, url: types.URL, session: types.Session = None, **kwargs) -> types.Response: """Constructs and sends a :class:`Request `. :param method: method for the new :class:`Request` object. @@ -62,7 +62,7 @@ def request(method, url, session=None, **kwargs): return session.request(method=method, url=url, **kwargs) -def get(url, params=None, **kwargs): +def get(url: types.URL, params: types.Params = None, **kwargs) -> types.Response: r"""Sends a GET request. :param url: URL for the new :class:`Request` object. @@ -76,7 +76,7 @@ def get(url, params=None, **kwargs): return request('get', url, params=params, **kwargs) -def options(url, **kwargs): +def options(url: types.URL, **kwargs) -> types.Response: r"""Sends an OPTIONS request. :param url: URL for the new :class:`Request` object. @@ -89,7 +89,7 @@ def options(url, **kwargs): return request('options', url, **kwargs) -def head(url, **kwargs): +def head(url: types.URL, **kwargs) -> types.Response: r"""Sends a HEAD request. :param url: URL for the new :class:`Request` object. @@ -102,7 +102,7 @@ def head(url, **kwargs): return request('head', url, **kwargs) -def post(url, data=None, json=None, **kwargs): +def post(url: types.URL, data: types.Data = None, json: types.JSON = None, **kwargs) -> types.Response: r"""Sends a POST request. :param url: URL for the new :class:`Request` object. @@ -116,7 +116,7 @@ def post(url, data=None, json=None, **kwargs): return request('post', url, data=data, json=json, **kwargs) -def put(url, data=None, **kwargs): +def put(url: types.URL, data: types.Data = None, **kwargs) -> types.Response: r"""Sends a PUT request. :param url: URL for the new :class:`Request` object. @@ -130,7 +130,7 @@ def put(url, data=None, **kwargs): return request('put', url, data=data, **kwargs) -def patch(url, data=None, **kwargs): +def patch(url: types.URL, data: types.Data = None, **kwargs) -> types.Response: r"""Sends a PATCH request. :param url: URL for the new :class:`Request` object. @@ -144,7 +144,7 @@ def patch(url, data=None, **kwargs): return request('patch', url, data=data, **kwargs) -def delete(url, **kwargs): +def delete(url: types.URL, **kwargs) -> types.Response: r"""Sends a DELETE request. :param url: URL for the new :class:`Request` object. diff --git a/requests/basics.py b/requests/basics.py index 610a80d8..bcecf130 100644 --- a/requests/basics.py +++ b/requests/basics.py @@ -21,6 +21,7 @@ from http import cookiejar as cookielib from http.cookies import Morsel from io import StringIO + builtin_str = str str = str bytes = bytes diff --git a/requests/types.py b/requests/types.py index 994075ba..69846dde 100644 --- a/requests/types.py +++ b/requests/types.py @@ -1,11 +1,12 @@ from typing import ( Callable, Optional, Union, Any, Iterable, List, Mapping, MutableMapping, - Tuple, IO, Text + Tuple, IO, Text, Type ) from . import auth from .models import Response, PreparedRequest from .cookies import RequestsCookieJar +from .sessions import Session _ParamsMappingValueType = Union[str, bytes, int, float, Iterable[Union[str, bytes, int, float]]] Params = Optional[