aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/console/grideditor/col_text.py
diff options
context:
space:
mode:
Diffstat (limited to 'mitmproxy/console/grideditor/col_text.py')
-rw-r--r--mitmproxy/console/grideditor/col_text.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/mitmproxy/console/grideditor/col_text.py b/mitmproxy/console/grideditor/col_text.py
index 29c1abac..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):
@@ -26,14 +25,15 @@ class Column(col_bytes.Column):
# This is the same for both edit and display.
-class EncodingMixin(object):
- def __init__(self, data: str, encoding_args):
+class EncodingMixin:
+ def __init__(self, data, encoding_args):
+ # 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: