diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2020-11-28 12:11:51 -0800 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2020-11-28 12:29:02 -0800 |
| commit | a215fbdb97e4e0384fddd18ddefad56edabc5d36 (patch) | |
| tree | c46bd2d41fb0e4711f21a293dcece2fe47820c52 /src | |
| parent | 264aa8b9cc8753e07692484732b897978c6fa8cb (diff) | |
| download | webob-a215fbdb97e4e0384fddd18ddefad56edabc5d36.tar.gz | |
Format using isort/black to satisfy linter
Diffstat (limited to 'src')
| -rw-r--r-- | src/webob/acceptparse.py | 1 | ||||
| -rw-r--r-- | src/webob/client.py | 6 | ||||
| -rw-r--r-- | src/webob/compat.py | 16 | ||||
| -rw-r--r-- | src/webob/cookies.py | 4 | ||||
| -rw-r--r-- | src/webob/datetime_utils.py | 2 | ||||
| -rw-r--r-- | src/webob/descriptors.py | 9 | ||||
| -rw-r--r-- | src/webob/exc.py | 4 | ||||
| -rw-r--r-- | src/webob/multidict.py | 2 | ||||
| -rw-r--r-- | src/webob/request.py | 2 | ||||
| -rw-r--r-- | src/webob/response.py | 8 | ||||
| -rw-r--r-- | src/webob/static.py | 2 |
11 files changed, 24 insertions, 32 deletions
diff --git a/src/webob/acceptparse.py b/src/webob/acceptparse.py index 2c8aa1d..ee5e78b 100644 --- a/src/webob/acceptparse.py +++ b/src/webob/acceptparse.py @@ -10,7 +10,6 @@ import re import textwrap import warnings - # RFC 7230 Section 3.2.3 "Whitespace" # OWS = *( SP / HTAB ) # ; optional whitespace diff --git a/src/webob/client.py b/src/webob/client.py index 6ec7742..f8c380d 100644 --- a/src/webob/client.py +++ b/src/webob/client.py @@ -1,14 +1,16 @@ import errno -import sys import re +import sys try: import httplib except ImportError: import http.client as httplib -from webob.compat import url_quote + import socket + from webob import exc +from webob.compat import url_quote __all__ = ["send_request_app", "SendRequest"] diff --git a/src/webob/compat.py b/src/webob/compat.py index fd46a85..effa79d 100644 --- a/src/webob/compat.py +++ b/src/webob/compat.py @@ -1,23 +1,19 @@ # flake8: noqa import cgi +from cgi import FieldStorage as _cgi_FieldStorage, parse_header +from html import escape +from queue import Empty, Queue import sys import tempfile import types -from cgi import FieldStorage as _cgi_FieldStorage -from cgi import parse_header - -from html import escape -from queue import Empty, Queue from urllib import parse -from urllib.parse import quote as url_quote -from urllib.parse import quote_plus -from urllib.parse import urlencode as url_encode +from urllib.parse import quote as url_quote, quote_plus, urlencode as url_encode from urllib.request import urlopen as url_open - urlparse = parse + def unquote(string): if not string: return b"" @@ -57,7 +53,7 @@ def parse_qsl_text(qs, encoding="utf-8"): # Various different FieldStorage work-arounds required on Python 3.x class cgi_FieldStorage(_cgi_FieldStorage): # pragma: no cover def __repr__(self): - """ monkey patch for FieldStorage.__repr__ + """monkey patch for FieldStorage.__repr__ Unbelievably, the default __repr__ on FieldStorage reads the entire file content instead of being sane about it. diff --git a/src/webob/cookies.py b/src/webob/cookies.py index 3048d5f..3f7c669 100644 --- a/src/webob/cookies.py +++ b/src/webob/cookies.py @@ -1,5 +1,7 @@ import base64 import binascii +from collections.abc import MutableMapping +from datetime import date, datetime, timedelta import hashlib import hmac import json @@ -7,8 +9,6 @@ import re import string import time import warnings -from collections.abc import MutableMapping -from datetime import date, datetime, timedelta from webob.util import bytes_, strings_differ, text_ diff --git a/src/webob/datetime_utils.py b/src/webob/datetime_utils.py index 9acc28a..b9bbb43 100644 --- a/src/webob/datetime_utils.py +++ b/src/webob/datetime_utils.py @@ -1,7 +1,7 @@ import calendar -import time from datetime import date, datetime, timedelta, tzinfo from email.utils import formatdate, mktime_tz, parsedate_tz +import time from webob.util import text_ diff --git a/src/webob/descriptors.py b/src/webob/descriptors.py index f790746..e24b4f4 100644 --- a/src/webob/descriptors.py +++ b/src/webob/descriptors.py @@ -1,16 +1,11 @@ -import re - -from datetime import date, datetime - from collections import namedtuple +from datetime import date, datetime +import re from webob.byterange import ContentRange, Range - from webob.datetime_utils import parse_date, serialize_date - from webob.util import header_docstring, warn_deprecation - CHARSET_RE = re.compile(r";\s*charset=([^;]*)", re.I) SCHEME_RE = re.compile(r"^[a-z]+:", re.I) diff --git a/src/webob/exc.py b/src/webob/exc.py index f4745e7..be53625 100644 --- a/src/webob/exc.py +++ b/src/webob/exc.py @@ -167,8 +167,8 @@ References: import json import re -import sys from string import Template +import sys from webob.acceptparse import create_accept_header from webob.compat import urlparse @@ -277,7 +277,7 @@ ${body}""" comment=None, body_template=None, json_formatter=None, - **kw + **kw, ): Response.__init__(self, status="%s %s" % (self.code, self.title), **kw) Exception.__init__(self, detail) diff --git a/src/webob/multidict.py b/src/webob/multidict.py index 523ddd4..50ddd81 100644 --- a/src/webob/multidict.py +++ b/src/webob/multidict.py @@ -5,8 +5,8 @@ Gives a multi-value dictionary object (MultiDict) plus several wrappers """ import binascii -import warnings from collections.abc import MutableMapping +import warnings from webob.compat import url_encode diff --git a/src/webob/request.py b/src/webob/request.py index 7408255..b0920d3 100644 --- a/src/webob/request.py +++ b/src/webob/request.py @@ -44,7 +44,7 @@ from webob.descriptors import ( from webob.etag import AnyETag, IfRange, NoETag, etag_property from webob.headers import EnvironHeaders from webob.multidict import GetDict, MultiDict, NestedMultiDict, NoVars -from webob.util import text_, bytes_ +from webob.util import bytes_, text_ try: import simplejson as json diff --git a/src/webob/response.py b/src/webob/response.py index 435ea62..48cb06d 100644 --- a/src/webob/response.py +++ b/src/webob/response.py @@ -1,9 +1,9 @@ -import re -import struct -import zlib from base64 import b64encode from datetime import datetime, timedelta from hashlib import md5 +import re +import struct +import zlib from webob.byterange import ContentRange from webob.cachecontrol import CacheControl, serialize_cache_control @@ -173,7 +173,7 @@ class Response: content_type=None, conditional_response=None, charset=_marker, - **kw + **kw, ): # Do some sanity checking, and turn json_body into an actual body diff --git a/src/webob/static.py b/src/webob/static.py index 508d2a5..114bfd0 100644 --- a/src/webob/static.py +++ b/src/webob/static.py @@ -58,7 +58,7 @@ class FileApp: content_length=stat.st_size, last_modified=stat.st_mtime, # @@ etag - **self.kw + **self.kw, ).conditional_response_app |
