always use relative imports, fix status bar bug

libmproxy/app.py

@@ -1,6 +1,7 @@
+from __future__ import absolute_import
 import flask
 import os.path, os
-import proxy
+from . import proxy
 
 mapp = flask.Flask(__name__)
 mapp.debug = True

libmproxy/cmdline.py

@@ -1,8 +1,10 @@
-from . import proxy
-import re, filt
+from __future__ import absolute_import
+import re
 import argparse
 from argparse import ArgumentTypeError
 from netlib import http
+from . import proxy, filt
+
 
 APP_HOST = "mitm.it"
 APP_PORT = 80

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 @@ def get_status(self):
         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:

libmproxy/console/common.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import urwid
 import urwid.util
 from .. import utils

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

libmproxy/console/flowdetailview.py

@@ -1,5 +1,6 @@
+from __future__ import absolute_import
 import urwid
-import common
+from . import common
 from .. import utils
 
 footer = [

libmproxy/console/flowlist.py

@@ -1,5 +1,6 @@
+from __future__ import absolute_import
 import urwid
-import common
+from . import common
 
 def _mkhelp():
     text = []

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
 

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
 

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 = [

libmproxy/contrib/jsbeautifier/unpackers/__init__.py

@@ -7,7 +7,7 @@
 
 import pkgutil
 import re
-from jsbeautifier.unpackers import evalbased
+from . import evalbased
 
 # NOTE: AT THE MOMENT, IT IS DEACTIVATED FOR YOUR SECURITY: it runs js!
 BLACKLIST = ['jsbeautifier.unpackers.evalbased']

libmproxy/controller.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import Queue, threading
 
 should_exit = False

libmproxy/dump.py

@@ -1,6 +1,7 @@
+from __future__ import absolute_import
 import sys, os
 import netlib.utils
-import flow, filt, utils
+from . import flow, filt, utils
 
 class DumpError(Exception): pass
 

libmproxy/encoding.py

@@ -1,6 +1,7 @@
 """
     Utility functions for decoding response bodies.
 """
+from __future__ import absolute_import
 import cStringIO
 import gzip, zlib
 

libmproxy/filt.py

@@ -31,8 +31,9 @@
         ~c CODE     Response code.
         rex         Equivalent to ~u rex
 """
+from __future__ import absolute_import
 import re, sys
-import contrib.pyparsing as pp
+from .contrib import pyparsing as pp
 
 
 class _Token:

libmproxy/flow.py

@@ -2,20 +2,18 @@
     This module provides more sophisticated flow tracking. These match requests
     with their responses, and provide filtering and interception facilities.
 """
+from __future__ import absolute_import
 import base64
 import hashlib, Cookie, cookielib, re, threading
 import os
 import flask
 import requests
-from . import controller, protocol
+from netlib import odict, wsgi, tcp
+import netlib.http
+from . import controller, protocol, tnetstring, filt, script, version, app
 from .protocol import http
 from .proxy.connection import ServerConnection
 from .proxy.primitives import ProxyError
-import tnetstring, filt, script
-from netlib import odict, wsgi, tcp
-import netlib.http
-import version
-import app
 
 ODict = odict.ODict
 ODictCaseless = odict.ODictCaseless

libmproxy/protocol/handle.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from . import http, tcp
 
 protocols = {

libmproxy/protocol/http.py

@@ -1,7 +1,8 @@
+from __future__ import absolute_import
 import Cookie, urllib, urlparse, time, copy
 from email.utils import parsedate_tz, formatdate, mktime_tz
-import netlib.utils
 from netlib import http, tcp, http_status
+import netlib.utils
 from netlib.odict import ODict, ODictCaseless
 from .primitives import KILL, ProtocolHandler, TemporaryServerChangeMixin, Flow, Error
 from ..proxy.connection import ServerConnection

libmproxy/protocol/primitives.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from .. import stateobject, utils, version
 from ..proxy.primitives import AddressPriority
 from ..proxy.connection import ClientConnection, ServerConnection

libmproxy/protocol/tcp.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import select, socket
 from cStringIO import StringIO
 from .primitives import ProtocolHandler

libmproxy/proxy/config.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 from .. import utils, platform
 from netlib import http_auth, certutils

libmproxy/proxy/connection.py

@@ -1,8 +1,9 @@
+from __future__ import absolute_import
 import copy
 import os
+from netlib import tcp, certutils
 from .. import stateobject, utils
 from .primitives import ProxyError
-from netlib import tcp, certutils
 
 
 class ClientConnection(tcp.BaseHandler, stateobject.SimpleStateObject):

libmproxy/proxy/primitives.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 class ProxyError(Exception):
     def __init__(self, code, msg, headers=None):
         self.code, self.msg, self.headers = code, msg, headers

libmproxy/proxy/server.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import socket
 from OpenSSL import SSL
 from netlib import tcp

libmproxy/script.py

@@ -1,5 +1,6 @@
+from __future__ import absolute_import
 import os, traceback, threading, shlex
-import controller
+from . import controller
 
 class ScriptError(Exception):
     pass

libmproxy/stateobject.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 class StateObject(object):
     def _get_state(self):
         raise NotImplementedError  # pragma: nocover

libmproxy/utils.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os, datetime, urllib, re
 import time, functools, cgi
 import json