python3: clean up super and __future__

5 files changed, 13 insertions, 18 deletions

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")])
         ]