diff options
Diffstat (limited to 'mitmproxy/models')
| -rw-r--r-- | mitmproxy/models/__init__.py | 1 | ||||
| -rw-r--r-- | mitmproxy/models/connections.py | 7 | ||||
| -rw-r--r-- | mitmproxy/models/flow.py | 5 | ||||
| -rw-r--r-- | mitmproxy/models/http.py | 9 | ||||
| -rw-r--r-- | mitmproxy/models/tcp.py | 3 |
5 files changed, 10 insertions, 15 deletions
diff --git a/mitmproxy/models/__init__.py b/mitmproxy/models/__init__.py index 7b7eaef0..25319b2d 100644 --- a/mitmproxy/models/__init__.py +++ b/mitmproxy/models/__init__.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, division from netlib.http import decoded from .connections import ClientConnection, ServerConnection diff --git a/mitmproxy/models/connections.py b/mitmproxy/models/connections.py index a99327d8..bf7a12aa 100644 --- a/mitmproxy/models/connections.py +++ b/mitmproxy/models/connections.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, division import time import copy @@ -27,7 +26,7 @@ class ClientConnection(tcp.BaseHandler, stateobject.StateObject): # Eventually, this object is restored from state. We don't have a # connection then. if client_connection: - super(ClientConnection, self).__init__(client_connection, address, server) + super().__init__(client_connection, address, server) else: self.connection = None self.server = None @@ -91,11 +90,11 @@ class ClientConnection(tcp.BaseHandler, stateobject.StateObject): )) def convert_to_ssl(self, *args, **kwargs): - super(ClientConnection, self).convert_to_ssl(*args, **kwargs) + super().convert_to_ssl(*args, **kwargs) self.timestamp_ssl_setup = time.time() def finish(self): - super(ClientConnection, self).finish() + super().finish() self.timestamp_end = time.time() diff --git a/mitmproxy/models/flow.py b/mitmproxy/models/flow.py index 95a5a699..2379b391 100644 --- a/mitmproxy/models/flow.py +++ b/mitmproxy/models/flow.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, division import time import copy @@ -97,7 +96,7 @@ class Flow(stateobject.StateObject): ) def get_state(self): - d = super(Flow, self).get_state() + d = super().get_state() d.update(version=version.IVERSION) if self._backup and self._backup != d: d.update(backup=self._backup) @@ -107,7 +106,7 @@ class Flow(stateobject.StateObject): state.pop("version") if "backup" in state: self._backup = state.pop("backup") - super(Flow, self).set_state(state) + super().set_state(state) @classmethod def from_state(cls, state): diff --git a/mitmproxy/models/http.py b/mitmproxy/models/http.py index a76d8b91..e679205d 100644 --- a/mitmproxy/models/http.py +++ b/mitmproxy/models/http.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, division import cgi @@ -57,7 +56,7 @@ class HTTPRequest(http.Request): self.is_replay = is_replay def get_state(self): - state = super(HTTPRequest, self).get_state() + state = super().get_state() state.update( stickycookie=self.stickycookie, stickyauth=self.stickyauth, @@ -69,7 +68,7 @@ class HTTPRequest(http.Request): self.stickycookie = state.pop("stickycookie") self.stickyauth = state.pop("stickyauth") self.is_replay = state.pop("is_replay") - super(HTTPRequest, self).set_state(state) + super().set_state(state) @classmethod def wrap(self, request): @@ -154,7 +153,7 @@ class HTTPFlow(flow.Flow): """ def __init__(self, client_conn, server_conn, live=None): - super(HTTPFlow, self).__init__("http", client_conn, server_conn, live) + super().__init__("http", client_conn, server_conn, live) self.request = None """ :py:class:`HTTPRequest` object """ @@ -189,7 +188,7 @@ class HTTPFlow(flow.Flow): return s.format(flow=self) def copy(self): - f = super(HTTPFlow, self).copy() + f = super().copy() if self.request: f.request = self.request.copy() if self.response: diff --git a/mitmproxy/models/tcp.py b/mitmproxy/models/tcp.py index e33475c2..1be23d79 100644 --- a/mitmproxy/models/tcp.py +++ b/mitmproxy/models/tcp.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, division import time @@ -43,7 +42,7 @@ class TCPFlow(Flow): """ def __init__(self, client_conn, server_conn, live=None): - super(TCPFlow, self).__init__("tcp", client_conn, server_conn, live) + super().__init__("tcp", client_conn, server_conn, live) self.messages = [] # type: List[TCPMessage] _stateobject_attributes = Flow._stateobject_attributes.copy() |