always use relative imports, fix status bar bug

8 files changed, 20 insertions, 15 deletions

diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index 846abba7..ecca0909 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -1,8 +1,9 @@
+from __future__ import absolute_import
 import mailcap, mimetypes, tempfile, os, subprocess, glob, time, shlex, stat
 import os.path, sys, weakref, traceback
 import urwid
-from .. import controller, utils, flow, script
-import flowlist, flowview, help, common, grideditor, palettes, contentview, flowdetailview
+from .. import controller, utils, flow, script, proxy
+from . import flowlist, flowview, help, common, grideditor, palettes, contentview, flowdetailview
 
 EVENTLOG_SIZE = 500
 
@@ -168,8 +169,9 @@ class StatusBar(common.WWrap):
         if opts:
             r.append("[%s]"%(":".join(opts)))
 
-        if self.master.server.config.upstream_server:
-            r.append("[dest:%s]"%utils.unparse_url(*self.master.server.config.upstream_server))
+        if self.master.server.config.get_upstream_server and \
+                isinstance(self.master.server.config.get_upstream_server, proxy.ConstUpstreamServerResolver):
+            r.append("[dest:%s]"%utils.unparse_url(*self.master.server.config.get_upstream_server.dst))
         if self.master.scripts:
             r.append("[scripts:%s]"%len(self.master.scripts))
         if self.master.debug:
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 7e2ecbf5..a8440f79 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import urwid
 import urwid.util
 from .. import utils
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py
index d39d1b9c..60ca13b8 100644
--- a/libmproxy/console/contentview.py
+++ b/libmproxy/console/contentview.py
@@ -1,16 +1,13 @@
-import logging
-import re, cStringIO, traceback, json
-import urwid
-
+from __future__ import absolute_import
+import logging, subprocess, re, cStringIO, traceback, json, urwid
 from PIL import Image
 from PIL.ExifTags import TAGS
 
 import lxml.html, lxml.etree
 import netlib.utils
-import common
+from . import common
 from .. import utils, encoding, flow
 from ..contrib import jsbeautifier, html2text
-import subprocess
 try:
     import pyamf
     from pyamf import remoting, flex
diff --git a/libmproxy/console/flowdetailview.py b/libmproxy/console/flowdetailview.py
index 436d8f07..134c2471 100644
--- a/libmproxy/console/flowdetailview.py
+++ b/libmproxy/console/flowdetailview.py
@@ -1,5 +1,6 @@
+from __future__ import absolute_import
 import urwid
-import common
+from . import common
 from .. import utils
 
 footer = [
diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index 6ba97733..deddae60 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -1,5 +1,6 @@
+from __future__ import absolute_import
 import urwid
-import common
+from . import common
 
 def _mkhelp():
     text = []
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 9b636840..c7cdfa6c 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -1,6 +1,7 @@
+from __future__ import absolute_import
 import os, sys, copy
 import urwid
-import common, grideditor, contentview
+from . import common, grideditor, contentview
 from .. import utils, flow, controller
 from ..protocol.http import HTTPResponse, CONTENT_MISSING
 
diff --git a/libmproxy/console/grideditor.py b/libmproxy/console/grideditor.py
index bbdde4e3..642d8638 100644
--- a/libmproxy/console/grideditor.py
+++ b/libmproxy/console/grideditor.py
@@ -1,6 +1,7 @@
+from __future__ import absolute_import
 import copy, re, os
 import urwid
-import common
+from . import common
 from .. import utils, filt, script
 from netlib import http_uastrings
 
diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py
index b0b7c48c..bd7217e1 100644
--- a/libmproxy/console/help.py
+++ b/libmproxy/console/help.py
@@ -1,5 +1,6 @@
+from __future__ import absolute_import
 import urwid
-import common
+from . import common
 from .. import filt, version
 
 footer = [