From 1c26516b1822d82e3b701539591a1d22831e0a19 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Thu, 30 Apr 2015 12:18:01 +1200
Subject: pretty_size now lives in netlib.utils

---
 libmproxy/console/common.py      | 3 ++-
 libmproxy/console/contentview.py | 2 +-
 libmproxy/console/statusbar.py   | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'libmproxy/console')

diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index ba6ba5b0..b920a11f 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -7,6 +7,7 @@ import os
 from .. import utils
 from ..protocol.http import CONTENT_MISSING, decoded
 from . import signals
+import netlib.utils
 
 try:
     import pyperclip
@@ -379,7 +380,7 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2):
     )
     if f.response:
         if f.response.content:
-            contentdesc = utils.pretty_size(len(f.response.content))
+            contentdesc = netlib.utils.pretty_size(len(f.response.content))
         elif f.response.content == CONTENT_MISSING:
             contentdesc = "[content missing]"
         else:
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py
index 454c992f..aafba4d7 100644
--- a/libmproxy/console/contentview.py
+++ b/libmproxy/console/contentview.py
@@ -60,7 +60,7 @@ def trailer(clen, txt, limit):
         txt.append(
             urwid.Text(
                 [
-                    ("highlight", "... %s of data not shown. Press "%utils.pretty_size(rem)),
+                    ("highlight", "... %s of data not shown. Press "%netlib.utils.pretty_size(rem)),
                     ("key", "f"),
                     ("highlight", " to load all data.")
                 ]
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
                 )
             )
-- 
cgit v1.2.3