python3: clean up super and __future__

21 files changed, 34 insertions, 55 deletions

diff --git a/mitmproxy/console/common.py b/mitmproxy/console/common.py
index e1366c1e..5e335c71 100644
--- a/mitmproxy/console/common.py
+++ b/mitmproxy/console/common.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, print_function, division
 
 import os
 
diff --git a/mitmproxy/console/flowdetailview.py b/mitmproxy/console/flowdetailview.py
index 0a03e1c4..64fdd40b 100644
--- a/mitmproxy/console/flowdetailview.py
+++ b/mitmproxy/console/flowdetailview.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import urwid
 
diff --git a/mitmproxy/console/flowlist.py b/mitmproxy/console/flowlist.py
index 73c8ade5..70ce6cb6 100644
--- a/mitmproxy/console/flowlist.py
+++ b/mitmproxy/console/flowlist.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import urwid
 
@@ -297,7 +296,7 @@ class FlowListBox(urwid.ListBox):
 
     def __init__(self, master: "mitmproxy.console.master.ConsoleMaster"):
         self.master = master
-        super(FlowListBox, self).__init__(FlowListWalker(master, master.state))
+        super().__init__(FlowListWalker(master, master.state))
 
     def get_method_raw(self, k):
         if k:
diff --git a/mitmproxy/console/flowview.py b/mitmproxy/console/flowview.py
index 3b43fd49..8e041405 100644
--- a/mitmproxy/console/flowview.py
+++ b/mitmproxy/console/flowview.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import math
 import os
@@ -134,7 +133,7 @@ class FlowView(tabs.Tabs):
 
     def __init__(self, master, state, flow, tab_offset):
         self.master, self.state, self.flow = master, state, flow
-        super(FlowView, self).__init__(
+        super().__init__(
             [
                 (self.tab_request, self.view_request),
                 (self.tab_response, self.view_response),
@@ -508,7 +507,7 @@ class FlowView(tabs.Tabs):
         elif self.tab_offset == TAB_RESP:
             conn = self.flow.response
 
-        key = super(self.__class__, self).keypress(size, key)
+        key = super().keypress(size, key)
 
         # Special case: Space moves over to the next flow.
         # We need to catch that before applying common.shortcuts()
diff --git a/mitmproxy/console/grideditor/base.py b/mitmproxy/console/grideditor/base.py
index ecbbd0f9..5825e50c 100644
--- a/mitmproxy/console/grideditor/base.py
+++ b/mitmproxy/console/grideditor/base.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import abc
 import copy
@@ -95,7 +94,7 @@ class GridRow(urwid.WidgetWrap):
         )
         if focused is not None:
             w.set_focus_column(focused)
-        super(GridRow, self).__init__(w)
+        super().__init__(w)
 
     def keypress(self, s, k):
         if self.edit_col:
@@ -127,7 +126,7 @@ class GridWalker(urwid.ListWalker):
 
     def _modified(self):
         self.editor.show_empty_msg()
-        return super(GridWalker, self)._modified()
+        return super()._modified()
 
     def add_value(self, lst):
         self.lst.append(
@@ -245,7 +244,7 @@ class GridWalker(urwid.ListWalker):
 
 class GridListBox(urwid.ListBox):
     def __init__(self, lw):
-        super(GridListBox, self).__init__(lw)
+        super().__init__(lw)
 
 
 FIRST_WIDTH_MAX = 40
@@ -301,7 +300,7 @@ class GridEditor(urwid.WidgetWrap):
             self.lb,
             header=urwid.Pile([title, h])
         )
-        super(GridEditor, self).__init__(w)
+        super().__init__(w)
         self.master.loop.widget.footer.update("")
         self.show_empty_msg()
 
diff --git a/mitmproxy/console/grideditor/col_bytes.py b/mitmproxy/console/grideditor/col_bytes.py
index 43d813be..51ce5a50 100644
--- a/mitmproxy/console/grideditor/col_bytes.py
+++ b/mitmproxy/console/grideditor/col_bytes.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import os
 from typing import Callable, Optional
@@ -74,7 +73,7 @@ class Display(base.Cell):
         self.data = data
         escaped = strutils.bytes_to_escaped_str(data)
         w = urwid.Text(escaped, wrap="any")
-        super(Display, self).__init__(w)
+        super().__init__(w)
 
     def get_data(self) -> bytes:
         return self.data
@@ -85,7 +84,7 @@ class Edit(base.Cell):
         data = strutils.bytes_to_escaped_str(data)
         w = urwid.Edit(edit_text=data, wrap="any", multiline=True)
         w = urwid.AttrWrap(w, "editfield")
-        super(Edit, self).__init__(w)
+        super().__init__(w)
 
     def get_data(self) -> bytes:
         txt = self._w.get_text()[0].strip()
diff --git a/mitmproxy/console/grideditor/col_subgrid.py b/mitmproxy/console/grideditor/col_subgrid.py
index 1dec8032..8a08f838 100644
--- a/mitmproxy/console/grideditor/col_subgrid.py
+++ b/mitmproxy/console/grideditor/col_subgrid.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 import urwid
 from mitmproxy.console.grideditor import base
 from mitmproxy.console import signals
@@ -7,7 +6,7 @@ from netlib.http import cookies
 
 class Column(base.Column):
     def __init__(self, heading, subeditor):
-        super(Column, self).__init__(heading)
+        super().__init__(heading)
         self.subeditor = subeditor
 
     def Edit(self, data):
@@ -45,7 +44,7 @@ class Display(base.Cell):
     def __init__(self, data):
         p = cookies._format_pairs(data, sep="\n")
         w = urwid.Text(p)
-        super(Display, self).__init__(w)
+        super().__init__(w)
 
     def get_data(self):
         pass
diff --git a/mitmproxy/console/grideditor/col_text.py b/mitmproxy/console/grideditor/col_text.py
index 9962c7b1..ae15374c 100644
--- a/mitmproxy/console/grideditor/col_text.py
+++ b/mitmproxy/console/grideditor/col_text.py
@@ -4,7 +4,6 @@ Welcome to the encoding dance!
 In a nutshell, text columns are actually a proxy class for byte columns,
 which just encode/decodes contents.
 """
-from __future__ import absolute_import, print_function, division
 
 from mitmproxy.console import signals
 from mitmproxy.console.grideditor import col_bytes
@@ -12,7 +11,7 @@ from mitmproxy.console.grideditor import col_bytes
 
 class Column(col_bytes.Column):
     def __init__(self, heading, encoding="utf8", errors="surrogateescape"):
-        super(Column, self).__init__(heading)
+        super().__init__(heading)
         self.encoding_args = encoding, errors
 
     def Display(self, data):
@@ -31,10 +30,10 @@ class EncodingMixin:
         # type: (str) -> TDisplay
         self.encoding_args = encoding_args
         data = data.encode(*self.encoding_args)
-        super(EncodingMixin, self).__init__(data)
+        super().__init__(data)
 
     def get_data(self) -> str:
-        data = super(EncodingMixin, self).get_data()
+        data = super().get_data()
         try:
             return data.decode(*self.encoding_args)
         except ValueError:
diff --git a/mitmproxy/console/grideditor/editors.py b/mitmproxy/console/grideditor/editors.py
index 0c9a2a02..7a1ef097 100644
--- a/mitmproxy/console/grideditor/editors.py
+++ b/mitmproxy/console/grideditor/editors.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 import re
 import urwid
 from mitmproxy import exceptions
@@ -29,7 +28,7 @@ class HeaderEditor(base.GridEditor):
     ]
 
     def make_help(self):
-        h = super(HeaderEditor, self).make_help()
+        h = super().make_help()
         text = [
             urwid.Text([("text", "Special keys:\n")])
         ]
@@ -106,7 +105,7 @@ class SetHeadersEditor(base.GridEditor):
         return False
 
     def make_help(self):
-        h = super(SetHeadersEditor, self).make_help()
+        h = super().make_help()
         text = [
             urwid.Text([("text", "Special keys:\n")])
         ]
diff --git a/mitmproxy/console/help.py b/mitmproxy/console/help.py
index 7393d7c4..06579206 100644
--- a/mitmproxy/console/help.py
+++ b/mitmproxy/console/help.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import platform
 
diff --git a/mitmproxy/console/master.py b/mitmproxy/console/master.py
index e7d74e2e..5f31cb74 100644
--- a/mitmproxy/console/master.py
+++ b/mitmproxy/console/master.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import mailcap
 import mimetypes
@@ -65,19 +64,19 @@ class ConsoleState(flow.State):
         return d.get(key, default)
 
     def add_flow(self, f):
-        super(ConsoleState, self).add_flow(f)
+        super().add_flow(f)
         signals.flowlist_change.send(self)
         self.update_focus()
         return f
 
     def update_flow(self, f):
-        super(ConsoleState, self).update_flow(f)
+        super().update_flow(f)
         signals.flowlist_change.send(self)
         self.update_focus()
         return f
 
     def set_view_filter(self, txt):
-        ret = super(ConsoleState, self).set_view_filter(txt)
+        ret = super().set_view_filter(txt)
         self.set_focus(self.focus)
         return ret
 
@@ -121,7 +120,7 @@ class ConsoleState(flow.State):
             self.focus -= 1
         if self.focus < 0:
             self.focus = None
-        ret = super(ConsoleState, self).delete_flow(f)
+        ret = super().delete_flow(f)
         self.set_focus(self.focus)
         return ret
 
@@ -185,7 +184,7 @@ class ConsoleState(flow.State):
 
     def clear(self):
         marked_flows = [f for f in self.view if f.marked]
-        super(ConsoleState, self).clear()
+        super().clear()
 
         for f in marked_flows:
             self.add_flow(f)
@@ -217,7 +216,7 @@ class Options(mitmproxy.options.Options):
         self.palette = palette
         self.palette_transparent = palette_transparent
         self.no_mouse = no_mouse
-        super(Options, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
 
 class ConsoleMaster(flow.FlowMaster):
@@ -679,22 +678,22 @@ class ConsoleMaster(flow.FlowMaster):
     # Handlers
     @controller.handler
     def error(self, f):
-        super(ConsoleMaster, self).error(f)
+        super().error(f)
         self.process_flow(f)
 
     @controller.handler
     def request(self, f):
-        super(ConsoleMaster, self).request(f)
+        super().request(f)
         self.process_flow(f)
 
     @controller.handler
     def response(self, f):
-        super(ConsoleMaster, self).response(f)
+        super().response(f)
         self.process_flow(f)
 
     @controller.handler
     def tcp_message(self, f):
-        super(ConsoleMaster, self).tcp_message(f)
+        super().tcp_message(f)
         message = f.messages[-1]
         direction = "->" if message.from_client else "<-"
         self.add_log("{client} {direction} tcp {direction} {server}".format(
diff --git a/mitmproxy/console/options.py b/mitmproxy/console/options.py
index 97313bf4..c4d9d872 100644
--- a/mitmproxy/console/options.py
+++ b/mitmproxy/console/options.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import urwid
 
@@ -144,7 +143,7 @@ class Options(urwid.WidgetWrap):
             self.lb,
             header = title
         )
-        super(Options, self).__init__(w)
+        super().__init__(w)
 
         self.master.loop.widget.footer.update("")
         signals.update_settings.connect(self.sig_update_settings)
@@ -157,7 +156,7 @@ class Options(urwid.WidgetWrap):
         if key == "C":
             self.clearall()
             return None
-        return super(self.__class__, self).keypress(size, key)
+        return super().keypress(size, key)
 
     def clearall(self):
         self.master.options.update(
diff --git a/mitmproxy/console/palettepicker.py b/mitmproxy/console/palettepicker.py
index f2acba0a..2bcb7387 100644
--- a/mitmproxy/console/palettepicker.py
+++ b/mitmproxy/console/palettepicker.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import urwid
 
diff --git a/mitmproxy/console/palettes.py b/mitmproxy/console/palettes.py
index 2e12338f..7b15f98f 100644
--- a/mitmproxy/console/palettes.py
+++ b/mitmproxy/console/palettes.py
@@ -3,7 +3,6 @@
 #
 # http://urwid.org/manual/displayattributes.html
 #
-from __future__ import absolute_import, print_function, division
 
 
 class Palette:
diff --git a/mitmproxy/console/pathedit.py b/mitmproxy/console/pathedit.py
index 0eae9123..2255c679 100644
--- a/mitmproxy/console/pathedit.py
+++ b/mitmproxy/console/pathedit.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import glob
 import os.path
diff --git a/mitmproxy/console/searchable.py b/mitmproxy/console/searchable.py
index d58d3d13..0fd6debc 100644
--- a/mitmproxy/console/searchable.py
+++ b/mitmproxy/console/searchable.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import urwid
 
@@ -44,7 +43,7 @@ class Searchable(urwid.ListBox):
             self.set_focus(len(self.walker) - 1)
             self.walker._modified()
         else:
-            return super(self.__class__, self).keypress(size, key)
+            return super().keypress(size, key)
 
     def set_search(self, text):
         self.state.last_search = text
diff --git a/mitmproxy/console/select.py b/mitmproxy/console/select.py
index 091f07a2..d5a3c42a 100644
--- a/mitmproxy/console/select.py
+++ b/mitmproxy/console/select.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import urwid
 
@@ -120,4 +119,4 @@ class Select(urwid.ListBox):
             self.keymap[key].activate()
             self.set_focus(self.options.index(self.keymap[key]))
             return None
-        return super(self.__class__, self).keypress(size, key)
+        return super().keypress(size, key)
diff --git a/mitmproxy/console/signals.py b/mitmproxy/console/signals.py
index 93eb399f..b5d3111f 100644
--- a/mitmproxy/console/signals.py
+++ b/mitmproxy/console/signals.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import blinker
 
diff --git a/mitmproxy/console/statusbar.py b/mitmproxy/console/statusbar.py
index 9536abe7..c43f68ad 100644
--- a/mitmproxy/console/statusbar.py
+++ b/mitmproxy/console/statusbar.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import os.path
 
@@ -120,7 +119,7 @@ class StatusBar(urwid.WidgetWrap):
         self.master = master
         self.helptext = helptext
         self.ib = urwid.WidgetWrap(urwid.Text(""))
-        super(StatusBar, self).__init__(urwid.Pile([self.ib, self.master.ab]))
+        super().__init__(urwid.Pile([self.ib, self.master.ab]))
         signals.update_settings.connect(self.sig_update_settings)
         signals.flowlist_change.connect(self.sig_update_settings)
         master.options.changed.connect(self.sig_update_settings)
diff --git a/mitmproxy/console/tabs.py b/mitmproxy/console/tabs.py
index a5e9c510..e2c2f6b9 100644
--- a/mitmproxy/console/tabs.py
+++ b/mitmproxy/console/tabs.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import urwid
 
@@ -25,7 +24,7 @@ class Tab(urwid.WidgetWrap):
 class Tabs(urwid.WidgetWrap):
 
     def __init__(self, tabs, tab_offset=0):
-        super(Tabs, self).__init__("")
+        super().__init__("")
         self.tab_offset = tab_offset
         self.tabs = tabs
         self.show()
diff --git a/mitmproxy/console/window.py b/mitmproxy/console/window.py
index ab2c80ad..a3a94933 100644
--- a/mitmproxy/console/window.py
+++ b/mitmproxy/console/window.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function, division
 
 import urwid
 
@@ -23,7 +22,7 @@ class Window(urwid.Frame):
 
     def mouse_event(self, *args, **kwargs):
         # args: (size, event, button, col, row)
-        k = super(self.__class__, self).mouse_event(*args, **kwargs)
+        k = super().mouse_event(*args, **kwargs)
         if not k:
             if args[1] == "mouse drag":
                 signals.status_message.send(
@@ -83,7 +82,7 @@ class Window(urwid.Frame):
                 )
 
     def keypress(self, size, k):
-        k = super(self.__class__, self).keypress(size, k)
+        k = super().keypress(size, k)
         if k == "?":
             self.master.view_help(self.helpctx)
         elif k == "i":