aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/console/grideditor/col_text.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-10-16 21:17:39 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-10-16 21:17:39 -0700
commit9389601025415c47d5efaa6ac371ddca6d543f48 (patch)
tree7a2fa561d702425ccec7edbc5a35108523e3f33d /mitmproxy/console/grideditor/col_text.py
parentae3ff8ee1edc646e7a640219df1a312c27f7c339 (diff)
parent5a07892bfc58472c1b651f66deaf03176bfe79df (diff)
downloadmitmproxy-9389601025415c47d5efaa6ac371ddca6d543f48.tar.gz
mitmproxy-9389601025415c47d5efaa6ac371ddca6d543f48.tar.bz2
mitmproxy-9389601025415c47d5efaa6ac371ddca6d543f48.zip
Merge branch 'such-types'
Diffstat (limited to 'mitmproxy/console/grideditor/col_text.py')
-rw-r--r--mitmproxy/console/grideditor/col_text.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/mitmproxy/console/grideditor/col_text.py b/mitmproxy/console/grideditor/col_text.py
index d60dc854..29c1abac 100644
--- a/mitmproxy/console/grideditor/col_text.py
+++ b/mitmproxy/console/grideditor/col_text.py
@@ -27,13 +27,12 @@ class Column(col_bytes.Column):
# This is the same for both edit and display.
class EncodingMixin(object):
- def __init__(self, data, encoding_args):
- # type: (str) -> TDisplay
+ def __init__(self, data: str, encoding_args):
self.encoding_args = encoding_args
data = data.encode(*self.encoding_args)
super(EncodingMixin, self).__init__(data)
- def get_data(self):
+ def get_data(self) -> str:
data = super(EncodingMixin, self).get_data()
try:
return data.decode(*self.encoding_args)