diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-10 22:36:47 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-10 22:36:47 +0100 |
| commit | c1fff51b1bf25ac048149398ae6b6dc14882a838 (patch) | |
| tree | 788d73aea0a1a436f97e7fdb89259cc325bab7e4 /libmproxy/protocol | |
| parent | e6349b540f15d3a8b5c19a5aeb7229b1a19d7543 (diff) | |
| download | mitmproxy-c1fff51b1bf25ac048149398ae6b6dc14882a838.tar.gz mitmproxy-c1fff51b1bf25ac048149398ae6b6dc14882a838.tar.bz2 mitmproxy-c1fff51b1bf25ac048149398ae6b6dc14882a838.zip | |
always use relative imports, fix status bar bug
Diffstat (limited to 'libmproxy/protocol')
| -rw-r--r-- | libmproxy/protocol/handle.py | 1 | ||||
| -rw-r--r-- | libmproxy/protocol/http.py | 3 | ||||
| -rw-r--r-- | libmproxy/protocol/primitives.py | 1 | ||||
| -rw-r--r-- | libmproxy/protocol/tcp.py | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/libmproxy/protocol/handle.py b/libmproxy/protocol/handle.py index 71c3243a..c94cc36e 100644 --- a/libmproxy/protocol/handle.py +++ b/libmproxy/protocol/handle.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import from . import http, tcp protocols = { diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 37fc4ee5..08dece37 100644 --- a/libmproxy/protocol/http.py +++ b/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 diff --git a/libmproxy/protocol/primitives.py b/libmproxy/protocol/primitives.py index 5b95e9e5..81730616 100644 --- a/libmproxy/protocol/primitives.py +++ b/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 diff --git a/libmproxy/protocol/tcp.py b/libmproxy/protocol/tcp.py index 9d0192c4..3a247858 100644 --- a/libmproxy/protocol/tcp.py +++ b/libmproxy/protocol/tcp.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import select, socket from cStringIO import StringIO from .primitives import ProtocolHandler |