diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-05-29 13:33:20 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-05-29 13:43:20 +0200 |
| commit | e2447406cc89c5a9c3e20f1faf4f5bb9fd2f55b7 (patch) | |
| tree | b37af6f7e7658aa8d4851fde80928475840921f3 /netlib | |
| parent | 5c45ca7f9aba05849bd8db24bb58c1951f79e630 (diff) | |
| download | mitmproxy-e2447406cc89c5a9c3e20f1faf4f5bb9fd2f55b7.tar.gz mitmproxy-e2447406cc89c5a9c3e20f1faf4f5bb9fd2f55b7.tar.bz2 mitmproxy-e2447406cc89c5a9c3e20f1faf4f5bb9fd2f55b7.zip | |
more style cleanup
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/http/headers.py | 2 | ||||
| -rw-r--r-- | netlib/http/request.py | 4 | ||||
| -rw-r--r-- | netlib/websockets/__init__.py | 13 |
3 files changed, 14 insertions, 5 deletions
diff --git a/netlib/http/headers.py b/netlib/http/headers.py index 6067ff5e..5cf15b6f 100644 --- a/netlib/http/headers.py +++ b/netlib/http/headers.py @@ -97,7 +97,7 @@ class Headers(MultiDict): headers = { _always_bytes(name).replace(b"_", b"-"): _always_bytes(value) for name, value in six.iteritems(headers) - } + } self.update(headers) @staticmethod diff --git a/netlib/http/request.py b/netlib/http/request.py index a6e2a5ef..fa8d54aa 100644 --- a/netlib/http/request.py +++ b/netlib/http/request.py @@ -240,7 +240,7 @@ class Request(Message): query = utils.urlencode(value) scheme, netloc, path, params, _, fragment = urllib.parse.urlparse(self.url) _, _, _, self.path = utils.parse_url( - urllib.parse.urlunparse([scheme, netloc, path, params, query, fragment])) + urllib.parse.urlunparse([scheme, netloc, path, params, query, fragment])) @query.setter def query(self, value): @@ -288,7 +288,7 @@ class Request(Message): path = "/" + "/".join(components) scheme, netloc, _, params, query, fragment = urllib.parse.urlparse(self.url) _, _, _, self.path = utils.parse_url( - urllib.parse.urlunparse([scheme, netloc, path, params, query, fragment])) + urllib.parse.urlunparse([scheme, netloc, path, params, query, fragment])) def anticache(self): """ diff --git a/netlib/websockets/__init__.py b/netlib/websockets/__init__.py index 1c143919..fea696d9 100644 --- a/netlib/websockets/__init__.py +++ b/netlib/websockets/__init__.py @@ -1,2 +1,11 @@ -from .frame import * -from .protocol import * +from __future__ import absolute_import, print_function, division +from .frame import FrameHeader, Frame, OPCODE +from .protocol import Masker, WebsocketsProtocol + +__all__ = [ + "FrameHeader", + "Frame", + "Masker", + "WebsocketsProtocol", + "OPCODE", +] |