netlib.human -> mitmproxy.utils.human

mitmproxy/addons/dumper.py

@@ -8,7 +8,7 @@ from mitmproxy import contentviews
 from mitmproxy import ctx
 from mitmproxy import exceptions
 from mitmproxy import flowfilter
-from netlib import human
+from mitmproxy.utils import human
 from netlib import strutils
 
 

mitmproxy/tools/cmdline.py

@@ -5,7 +5,7 @@ from mitmproxy import exceptions
 from mitmproxy import flowfilter
 from mitmproxy import options
 from mitmproxy import platform
-from netlib import human
+from mitmproxy.utils import human
 from netlib import tcp
 from mitmproxy import version
 

mitmproxy/tools/console/common.py

@@ -10,7 +10,7 @@ import netlib
 from mitmproxy.utils import lrucache
 from mitmproxy.tools.console import signals
 from mitmproxy import export
-from netlib import human
+from mitmproxy.utils import human
 
 try:
     import pyperclip

mitmproxy/tools/console/flowdetailview.py

@@ -1,7 +1,7 @@
 import urwid
 
 from mitmproxy.tools.console import common, searchable
-from netlib import human
+from mitmproxy.utils import human
 
 
 def maybe_timestamp(base, attr):

mitmproxy/tools/console/statusbar.py

@@ -6,7 +6,7 @@ import netlib.http.url
 from mitmproxy.tools.console import common
 from mitmproxy.tools.console import pathedit
 from mitmproxy.tools.console import signals
-from netlib import human
+from mitmproxy.utils import human
 
 
 class ActionBar(urwid.WidgetWrap):

netlib/http/response.py

@@ -1,6 +1,6 @@
 import time
 from email.utils import parsedate_tz, formatdate, mktime_tz
-from netlib import human
+from mitmproxy.utils import human
 from netlib import multidict
 from netlib.http import cookies
 from netlib.http import headers as nheaders

netlib/websockets/frame.py

@@ -5,7 +5,7 @@ import io
 from netlib import tcp
 from netlib import strutils
 from netlib import utils
-from netlib import human
+from mitmproxy.utils import human
 from .masker import Masker
 
 

pathod/language/base.py

@@ -5,7 +5,7 @@ import functools
 import pyparsing as pp
 
 from netlib import strutils
-from netlib import human
+from mitmproxy.utils import human
 
 from . import generators, exceptions
 

pathod/log.py

@@ -1,6 +1,7 @@
 import time
 
-from netlib import strutils, human
+from netlib import strutils
+from mitmproxy.utils import human
 
 
 def write_raw(fp, lines, timestamp=True):

pathod/pathod_cmdline.py

@@ -5,7 +5,7 @@ import os.path
 import re
 
 from netlib import tcp
-from netlib import human
+from mitmproxy.utils import human
 from mitmproxy import version
 from . import pathod
 

test/mitmproxy/test_utils_human.py

@@ -1,5 +1,6 @@
 import time
-from netlib import human, tutils
+from mitmproxy.utils import human
+from netlib import tutils
 
 
 def test_format_timestamp():

test/mitmproxy/test_utils_lrucache.py

@@ -1,8 +1,8 @@
-from mitmproxy import utils
+from mitmproxy.utils import lrucache
 
 
 def test_LRUCache():
-    cache = utils.LRUCache(2)
+    cache = lrucache.LRUCache(2)
 
     class Foo:
         ran = False