10 files changed, 15 insertions, 15 deletions
diff --git a/mitmproxy/tools/cmdline.py b/mitmproxy/tools/cmdline.py
index b83694ef..2f9ea15c 100644
--- a/mitmproxy/tools/cmdline.py
+++ b/mitmproxy/tools/cmdline.py
@@ -6,7 +6,7 @@ from mitmproxy import flowfilter
 from mitmproxy import options
 from mitmproxy import platform
 from mitmproxy.utils import human
-from netlib import tcp
+from mitmproxy.net import tcp
 from mitmproxy import version
 
 
diff --git a/mitmproxy/tools/console/common.py b/mitmproxy/tools/console/common.py
index 53411d17..90dce5ae 100644
--- a/mitmproxy/tools/console/common.py
+++ b/mitmproxy/tools/console/common.py
@@ -6,7 +6,7 @@ import os
 import urwid
 import urwid.util
 
-import netlib
+import mitmproxy.net
 from mitmproxy.utils import lrucache
 from mitmproxy.tools.console import signals
 from mitmproxy import export
@@ -226,7 +226,7 @@ def format_flow_data(key, scope, flow):
         if request.content is None:
             return None, "Request content is missing"
         if key == "h":
-            data += netlib.http.http1.assemble_request(request)
+            data += mitmproxy.net.http.http1.assemble_request(request)
         elif key == "c":
             data += request.get_content(strict=False)
         else:
@@ -240,7 +240,7 @@ def format_flow_data(key, scope, flow):
         if response.content is None:
             return None, "Response content is missing"
         if key == "h":
-            data += netlib.http.http1.assemble_response(response)
+            data += mitmproxy.net.http.http1.assemble_response(response)
         elif key == "c":
             data += response.get_content(strict=False)
         else:
diff --git a/mitmproxy/tools/console/flowlist.py b/mitmproxy/tools/console/flowlist.py
index 31624229..d33348a0 100644
--- a/mitmproxy/tools/console/flowlist.py
+++ b/mitmproxy/tools/console/flowlist.py
@@ -1,6 +1,6 @@
 import urwid
 
-import netlib.http.url
+import mitmproxy.net.http.url
 from mitmproxy import exceptions
 from mitmproxy.tools.console import common
 from mitmproxy.tools.console import signals
@@ -325,7 +325,7 @@ class FlowListBox(urwid.ListBox):
         )
 
     def new_request(self, url, method):
-        parts = netlib.http.url.parse(str(url))
+        parts = mitmproxy.net.http.url.parse(str(url))
         if not parts:
             signals.status_message.send(message="Invalid Url")
             return
diff --git a/mitmproxy/tools/console/flowview.py b/mitmproxy/tools/console/flowview.py
index afebf44e..4e886ee4 100644
--- a/mitmproxy/tools/console/flowview.py
+++ b/mitmproxy/tools/console/flowview.py
@@ -16,8 +16,8 @@ from mitmproxy.tools.console import searchable
 from mitmproxy.tools.console import signals
 from mitmproxy.tools.console import tabs
 from mitmproxy import export
-from netlib.http import Headers
-from netlib.http import status_codes
+from mitmproxy.net.http import Headers
+from mitmproxy.net.http import status_codes
 
 
 class SearchError(Exception):
diff --git a/mitmproxy/tools/console/grideditor/col_subgrid.py b/mitmproxy/tools/console/grideditor/col_subgrid.py
index 3147e63d..4db37462 100644
--- a/mitmproxy/tools/console/grideditor/col_subgrid.py
+++ b/mitmproxy/tools/console/grideditor/col_subgrid.py
@@ -1,7 +1,7 @@
 import urwid
 from mitmproxy.tools.console.grideditor import base
 from mitmproxy.tools.console import signals
-from netlib.http import cookies
+from mitmproxy.net.http import cookies
 
 
 class Column(base.Column):
diff --git a/mitmproxy/tools/console/grideditor/editors.py b/mitmproxy/tools/console/grideditor/editors.py
index 64361af7..5e3f3d42 100644
--- a/mitmproxy/tools/console/grideditor/editors.py
+++ b/mitmproxy/tools/console/grideditor/editors.py
@@ -9,7 +9,7 @@ from mitmproxy.tools.console.grideditor import col_bytes
 from mitmproxy.tools.console.grideditor import col_text
 from mitmproxy.tools.console.grideditor import col_subgrid
 from mitmproxy.tools.console import signals
-from netlib.http import user_agents
+from mitmproxy.net.http import user_agents
 
 
 class QueryEditor(base.GridEditor):
diff --git a/mitmproxy/tools/console/master.py b/mitmproxy/tools/console/master.py
index 7ff0026e..af43c53b 100644
--- a/mitmproxy/tools/console/master.py
+++ b/mitmproxy/tools/console/master.py
@@ -37,7 +37,7 @@ from mitmproxy.tools.console import window
 from mitmproxy.flowfilter import FMarked
 from mitmproxy.utils import strutils
 
-from netlib import tcp
+from mitmproxy.net import tcp
 
 EVENTLOG_SIZE = 500
 
diff --git a/mitmproxy/tools/console/statusbar.py b/mitmproxy/tools/console/statusbar.py
index ac41b213..74382677 100644
--- a/mitmproxy/tools/console/statusbar.py
+++ b/mitmproxy/tools/console/statusbar.py
@@ -2,7 +2,7 @@ import os.path
 
 import urwid
 
-import netlib.http.url
+import mitmproxy.net.http.url
 from mitmproxy.tools.console import common
 from mitmproxy.tools.console import pathedit
 from mitmproxy.tools.console import signals
@@ -208,7 +208,7 @@ class StatusBar(urwid.WidgetWrap):
 
         if self.master.options.mode in ["reverse", "upstream"]:
             dst = self.master.server.config.upstream_server
-            r.append("[dest:%s]" % netlib.http.url.unparse(
+            r.append("[dest:%s]" % mitmproxy.net.http.url.unparse(
                 dst.scheme,
                 dst.address.host,
                 dst.address.port
diff --git a/mitmproxy/tools/dump.py b/mitmproxy/tools/dump.py
index 47f69303..e92482f3 100644
--- a/mitmproxy/tools/dump.py
+++ b/mitmproxy/tools/dump.py
@@ -8,7 +8,7 @@ from mitmproxy import io
 from mitmproxy import options
 from mitmproxy import master
 from mitmproxy.addons import dumper, termlog
-from netlib import tcp
+from mitmproxy.net import tcp
 
 
 class DumpError(Exception):
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py
index 2bca4555..619582f3 100644
--- a/mitmproxy/tools/web/master.py
+++ b/mitmproxy/tools/web/master.py
@@ -13,7 +13,7 @@ from mitmproxy.addons import state
 from mitmproxy import options
 from mitmproxy import master
 from mitmproxy.tools.web import app
-from netlib.http import authentication
+from mitmproxy.net.http import authentication
 
 
 class Stop(Exception):