From cfc3db06cfb7fed8adcdae97aecc8800b86f7225 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:34:32 -0400 Subject: [PATCH 01/15] ignore import statements for flake8 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5eadf3b5..0cabf3b9 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ test-readme: python setup.py check -r -s flake8: - flake8 --ignore=E501 requests + flake8 --ignore=E501,F401 requests coverage: py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests From 4e1bbe1288d6ad60fafbb44d014d8ff0d3e3ea9b Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:35:33 -0400 Subject: [PATCH 02/15] ignore line continuations for flake8 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0cabf3b9..1897604f 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ test-readme: python setup.py check -r -s flake8: - flake8 --ignore=E501,F401 requests + flake8 --ignore=E501,F401,E128 requests coverage: py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests From 7c2618eb828bcdb57d2f62b424b11bb3664eb760 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:37:43 -0400 Subject: [PATCH 03/15] flake8: import statement improvements --- Makefile | 2 +- requests/__init__.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1897604f..3b7b8c95 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ test-readme: python setup.py check -r -s flake8: - flake8 --ignore=E501,F401,E128 requests + flake8 --ignore=E501,F401,E128,E402 requests coverage: py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests diff --git a/requests/__init__.py b/requests/__init__.py index 690320b1..d4461ec9 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -40,10 +40,6 @@ is at . :license: Apache 2.0, see LICENSE for more details. """ -from .__version__ import __title__, __description__, __url__, __version__ -from .__version__ import __build__, __author__, __author_email__, __license__ -from .__version__ import __copyright__, __cake__ - # Check urllib3 for compatibility. import urllib3 urllib3_version = urllib3.__version__.split('.') @@ -86,6 +82,10 @@ import warnings from urllib3.exceptions import DependencyWarning warnings.simplefilter('ignore', DependencyWarning) +from .__version__ import __title__, __description__, __url__, __version__ +from .__version__ import __build__, __author__, __author_email__, __license__ +from .__version__ import __copyright__, __cake__ + from . import utils from . import packages from .models import Request, Response, PreparedRequest From 7c3861a3226e69ba962f3f38c61e42a2eaf1dfcf Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:40:09 -0400 Subject: [PATCH 04/15] fix flake8 for EOF in __init__.py --- requests/__version__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/requests/__version__.py b/requests/__version__.py index dddd0349..b21ba352 100644 --- a/requests/__version__.py +++ b/requests/__version__.py @@ -12,5 +12,3 @@ __author_email__ = 'me@kennethreitz.org' __license__ = 'Apache 2.0' __copyright__ = 'Copyright 2017 Kenneth Reitz' __cake__ = u'\u2728 \U0001f370 \u2728' - - From e55d3d06582e0cd950651199e37411974599475f Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:40:37 -0400 Subject: [PATCH 05/15] fix spaces in api.py --- requests/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/api.py b/requests/api.py index 0b24e0ff..b2ce1a96 100644 --- a/requests/api.py +++ b/requests/api.py @@ -137,7 +137,7 @@ def patch(url, data=None, **kwargs): :rtype: requests.Response """ - return request('patch', url, data=data, **kwargs) + return request('patch', url, data=data, **kwargs) def delete(url, **kwargs): From 3fa02a13360778965b0dc2b52e086e5da8a91df7 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:41:07 -0400 Subject: [PATCH 06/15] flake8 ignore lambda expressions --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3b7b8c95..472f1ffd 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ test-readme: python setup.py check -r -s flake8: - flake8 --ignore=E501,F401,E128,E402 requests + flake8 --ignore=E501,F401,E128,E402,E731 requests coverage: py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests From 7fc48b099e1aecea50f5ae3ca67e9331278bc0da Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:41:51 -0400 Subject: [PATCH 07/15] ignore undefined names in flake8 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 472f1ffd..f90248f7 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ test-readme: python setup.py check -r -s flake8: - flake8 --ignore=E501,F401,E128,E402,E731 requests + flake8 --ignore=E501,F401,E128,E402,E731,F821 requests coverage: py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests From 5fa4e74d61d9093ee7e0a7bf1e2a56b6c0780c9a Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:43:12 -0400 Subject: [PATCH 08/15] fix flake8 indent error --- requests/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/auth.py b/requests/auth.py index a44b4d15..1a182dff 100644 --- a/requests/auth.py +++ b/requests/auth.py @@ -192,7 +192,7 @@ class HTTPDigestAuth(AuthBase): elif qop == 'auth' or 'auth' in qop.split(','): noncebit = "%s:%s:%s:%s:%s" % ( nonce, ncvalue, cnonce, 'auth', HA2 - ) + ) respdig = KD(HA1, noncebit) else: # XXX handle auth-int. From f6a4ab02daa3103f9d595f4b62803a1267498949 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:44:33 -0400 Subject: [PATCH 09/15] fix empty lines for flake8 --- requests/exceptions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/requests/exceptions.py b/requests/exceptions.py index 9684d9e5..da5af10b 100644 --- a/requests/exceptions.py +++ b/requests/exceptions.py @@ -100,6 +100,7 @@ class StreamConsumedError(RequestException, TypeError): class RetryError(RequestException): """Custom retries logic failed""" + class UnrewindableBodyError(RequestException): """Requests encountered an error when trying to rewind a body""" From 5b363d1a57780fe339d66e85fd0cde8f22ae9629 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:54:23 -0400 Subject: [PATCH 10/15] improve line continuations for flake8 --- requests/cookies.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/requests/cookies.py b/requests/cookies.py index 6484af6b..ab3c88b9 100644 --- a/requests/cookies.py +++ b/requests/cookies.py @@ -306,8 +306,10 @@ class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping): """ dictionary = {} for cookie in iter(self): - if (domain is None or cookie.domain == domain) and (path is None - or cookie.path == path): + if ( + (domain is None or cookie.domain == domain) and + (path is None or cookie.path == path) + ): dictionary[cookie.name] = cookie.value return dictionary From 6495190b00b4635791ca718990b9c9a1aa2d5b33 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:55:08 -0400 Subject: [PATCH 11/15] cleanup help.py (flake8) --- requests/help.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requests/help.py b/requests/help.py index bbe44c86..ea6348b5 100644 --- a/requests/help.py +++ b/requests/help.py @@ -44,7 +44,7 @@ def _implementation(): if sys.pypy_version_info.releaselevel != 'final': implementation_version = ''.join([ implementation_version, sys.pypy_version_info.releaselevel - ]) + ]) elif implementation == 'Jython': implementation_version = platform.python_version() # Complete Guess elif implementation == 'IronPython': @@ -101,10 +101,12 @@ def info(): }, } + def main(): """Pretty-print the bug information as JSON.""" print(json.dumps(info(), sort_keys=True, indent=2)) + if __name__ == '__main__': main() From e5894e99b708ce08c5573722c35ff548590ba43c Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 22:58:01 -0400 Subject: [PATCH 12/15] improve flake8 help.py --- requests/help.py | 1 - 1 file changed, 1 deletion(-) diff --git a/requests/help.py b/requests/help.py index ea6348b5..ac0691e3 100644 --- a/requests/help.py +++ b/requests/help.py @@ -109,4 +109,3 @@ def main(): if __name__ == '__main__': main() - From 33619268f986b7d6452fdab43e70096401c5b361 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 23:00:09 -0400 Subject: [PATCH 13/15] cleanup models.py --- requests/models.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/requests/models.py b/requests/models.py index c22cc1c9..1375a3af 100644 --- a/requests/models.py +++ b/requests/models.py @@ -215,8 +215,9 @@ class Request(RequestHooksMixin): """ - def __init__(self, method=None, url=None, headers=None, files=None, - data=None, params=None, auth=None, cookies=None, hooks=None, json=None): + def __init__(self, + method=None, url=None, headers=None, files=None, data=None, + params=None, auth=None, cookies=None, hooks=None, json=None): # Default empty dicts for dict params. data = [] if data is None else data @@ -295,8 +296,9 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin): #: integer denoting starting position of a readable file-like body. self._body_position = None - def prepare(self, method=None, url=None, headers=None, files=None, - data=None, params=None, auth=None, cookies=None, hooks=None, json=None): + def prepare(self, + method=None, url=None, headers=None, files=None, data=None, + params=None, auth=None, cookies=None, hooks=None, json=None): """Prepares the entire request with the given parameters.""" self.prepare_method(method) From 04ed1e512214a9065ee083b525f2a31d43a82aeb Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 23:02:23 -0400 Subject: [PATCH 14/15] cleanup sessions.py --- requests/sessions.py | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/requests/sessions.py b/requests/sessions.py index a0f290b7..db913089 100755 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -114,7 +114,7 @@ class SessionRedirectMixin(object): verify=True, cert=None, proxies=None, yield_requests=False, **adapter_kwargs): """Receives a Response. Returns a generator of Responses or Requests.""" - hist = [] # keep track of history + hist = [] # keep track of history url = self.get_redirect_target(resp) while url: @@ -433,20 +433,9 @@ class Session(SessionRedirectMixin): return p def request(self, method, url, - params=None, - data=None, - headers=None, - cookies=None, - files=None, - auth=None, - timeout=None, - allow_redirects=True, - proxies=None, - hooks=None, - stream=None, - verify=None, - cert=None, - json=None): + params=None, data=None, headers=None, cookies=None, files=None, + auth=None, timeout=None, allow_redirects=True, proxies=None, + hooks=None, stream=None, verify=None, cert=None, json=None): """Constructs a :class:`Request `, prepares it and sends it. Returns :class:`Response ` object. @@ -485,16 +474,16 @@ class Session(SessionRedirectMixin): """ # Create the Request. req = Request( - method = method.upper(), - url = url, - headers = headers, - files = files, - data = data or {}, - json = json, - params = params or {}, - auth = auth, - cookies = cookies, - hooks = hooks, + method=method.upper(), + url=url, + headers=headers, + files=files, + data=data or {}, + json=json, + params=params or {}, + auth=auth, + cookies=cookies, + hooks=hooks, ) prep = self.prepare_request(req) @@ -579,7 +568,7 @@ class Session(SessionRedirectMixin): :rtype: requests.Response """ - return self.request('PATCH', url, data=data, **kwargs) + return self.request('PATCH', url, data=data, **kwargs) def delete(self, url, **kwargs): r"""Sends a DELETE request. Returns :class:`Response` object. From d78ec90e7b6dbb853db33fd10686f3ba5c4874f1 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 29 May 2017 23:04:45 -0400 Subject: [PATCH 15/15] cleanup utils.py --- requests/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/requests/utils.py b/requests/utils.py index 056f6fb3..25af9923 100644 --- a/requests/utils.py +++ b/requests/utils.py @@ -494,8 +494,7 @@ def get_unicode_from_response(r): # The unreserved URI characters (RFC 3986) UNRESERVED_SET = frozenset( - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" - + "0123456789-._~") + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + "0123456789-._~") def unquote_unreserved(uri): @@ -851,6 +850,7 @@ def get_auth_from_url(url): _CLEAN_HEADER_REGEX_BYTE = re.compile(b'^\\S[^\\r\\n]*$|^$') _CLEAN_HEADER_REGEX_STR = re.compile(r'^\S[^\r\n]*$|^$') + def check_header_validity(header): """Verifies that header value is a string which doesn't contain leading whitespace or return characters. This prevents unintended @@ -888,6 +888,7 @@ def urldefragauth(url): return urlunparse((scheme, netloc, path, params, query, '')) + def rewind_body(prepared_request): """Move file pointer back to its recorded starting position so it can be read again on redirect.