diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-05-01 17:25:00 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-05-01 17:25:00 +0200 |
commit | c780fc7bdf818ce1a445b526ff3e5afc6c05807f (patch) | |
tree | 646f9051b3f89204af3c03edcf51ad4e7711acc0 /libmproxy/console/statusbar.py | |
parent | 3f5ca10c39a9f7d55e0f6943caf8f6ff762a0222 (diff) | |
parent | 1c26516b1822d82e3b701539591a1d22831e0a19 (diff) | |
download | mitmproxy-c780fc7bdf818ce1a445b526ff3e5afc6c05807f.tar.gz mitmproxy-c780fc7bdf818ce1a445b526ff3e5afc6c05807f.tar.bz2 mitmproxy-c780fc7bdf818ce1a445b526ff3e5afc6c05807f.zip |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/console/statusbar.py')
-rw-r--r-- | libmproxy/console/statusbar.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmproxy/console/statusbar.py b/libmproxy/console/statusbar.py index 5455ad6e..37ceef94 100644 --- a/libmproxy/console/statusbar.py +++ b/libmproxy/console/statusbar.py @@ -1,8 +1,8 @@ -import time import os.path import urwid +import netlib.utils from . import pathedit, signals, common from .. import utils @@ -22,7 +22,6 @@ class ActionBar(urwid.WidgetWrap): self.onekey = False self.pathprompt = False - def sig_message(self, sender, message, expire=None): w = urwid.Text(message) self._w = w @@ -191,7 +190,7 @@ class StatusBar(urwid.WidgetWrap): opts.append("following") if self.master.stream_large_bodies: opts.append( - "stream:%s" % utils.pretty_size( + "stream:%s" % netlib.utils.pretty_size( self.master.stream_large_bodies.max_size ) ) |