Merge pull request #1230 from redfast00/master

fix after cleanup of netlib.utils in mitmproxy.console.statusbar
This commit is contained in:
Maximilian Hils 2016-06-08 10:15:55 -07:00
commit f3f8dce5a0

View File

@ -4,7 +4,7 @@ import os.path
import urwid import urwid
import netlib.utils import netlib.http.url
from mitmproxy.console import common from mitmproxy.console import common
from mitmproxy.console import pathedit from mitmproxy.console import pathedit
from mitmproxy.console import signals from mitmproxy.console import signals
@ -212,7 +212,7 @@ class StatusBar(urwid.WidgetWrap):
if self.master.server.config.mode in ["reverse", "upstream"]: if self.master.server.config.mode in ["reverse", "upstream"]:
dst = self.master.server.config.upstream_server dst = self.master.server.config.upstream_server
r.append("[dest:%s]" % netlib.utils.unparse( r.append("[dest:%s]" % netlib.http.url.unparse(
dst.scheme, dst.scheme,
dst.address.host, dst.address.host,
dst.address.port dst.address.port