aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/controller.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-10-17 17:34:46 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-10-17 18:03:07 +1300
commitc774a9fec93feedc37a450400a03b83f5f4cb4b9 (patch)
tree507c346e8f8c605d428140274678fced2e6bbc16 /mitmproxy/controller.py
parenta647b30365593a4a3056fcf6936f5441ab9eda88 (diff)
downloadmitmproxy-c774a9fec93feedc37a450400a03b83f5f4cb4b9.tar.gz
mitmproxy-c774a9fec93feedc37a450400a03b83f5f4cb4b9.tar.bz2
mitmproxy-c774a9fec93feedc37a450400a03b83f5f4cb4b9.zip
python3: clean up super and __future__
Diffstat (limited to 'mitmproxy/controller.py')
-rw-r--r--mitmproxy/controller.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/mitmproxy/controller.py b/mitmproxy/controller.py
index 09b7abed..214dbd4c 100644
--- a/mitmproxy/controller.py
+++ b/mitmproxy/controller.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
import functools
import threading
@@ -177,7 +176,7 @@ class ServerThread(basethread.BaseThread):
def __init__(self, server):
self.server = server
address = getattr(self.server, "address", None)
- super(ServerThread, self).__init__(
+ super().__init__(
"ServerThread ({})".format(repr(address))
)
@@ -362,7 +361,7 @@ class DummyReply(Reply):
and during testing.
"""
def __init__(self):
- super(DummyReply, self).__init__(None)
+ super().__init__(None)
self._should_reset = False
def mark_reset(self):