move code from mitmproxy to netlib

2 files changed, 6 insertions, 3 deletions

diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py
index e4ffcd47..8f18ea7a 100644
--- a/libmproxy/console/contentview.py
+++ b/libmproxy/console/contentview.py
@@ -225,7 +225,7 @@ class ViewURLEncoded:
     content_types = ["application/x-www-form-urlencoded"]
 
     def __call__(self, hdrs, content, limit):
-        lines = utils.urldecode(content)
+        lines = netlib.utils.urldecode(content)
         if lines:
             body = common.format_keyvals(
                 [(k + ":", v) for (k, v) in lines],
diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index 46cd0de1..2b77f4a3 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 import urwid
+
 from netlib import http
+import netlib.utils
+
 from . import common, signals
 
 
@@ -219,7 +222,7 @@ class ConnectionItem(urwid.WidgetWrap):
         elif key == "U":
             for f in self.state.flows:
                 self.state.set_flow_marked(f, False)
-            signals.flowlist_change.send(self)       
+            signals.flowlist_change.send(self)
         elif key == "V":
             if not self.flow.modified():
                 signals.status_message.send(message="Flow not modified.")
@@ -321,7 +324,7 @@ class FlowListBox(urwid.ListBox):
         )
 
     def new_request(self, url, method):
-        parts = http.parse_url(str(url))
+        parts = netlib.utils.parse_url(str(url))
         if not parts:
             signals.status_message.send(message="Invalid Url")
             return