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/proxy | |
| 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/proxy')
| -rw-r--r-- | libmproxy/proxy/config.py | 1 | ||||
| -rw-r--r-- | libmproxy/proxy/connection.py | 3 | ||||
| -rw-r--r-- | libmproxy/proxy/primitives.py | 2 | ||||
| -rw-r--r-- | libmproxy/proxy/server.py | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index ae24d4c9..cf382dc7 100644 --- a/libmproxy/proxy/config.py +++ b/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 diff --git a/libmproxy/proxy/connection.py b/libmproxy/proxy/connection.py index 3a0273af..389a14ca 100644 --- a/libmproxy/proxy/connection.py +++ b/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): diff --git a/libmproxy/proxy/primitives.py b/libmproxy/proxy/primitives.py index e49d9bb4..8ae4b848 100644 --- a/libmproxy/proxy/primitives.py +++ b/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 diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index e0f058b5..a5b95fb7 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import socket from OpenSSL import SSL from netlib import tcp |