diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-08-01 14:53:34 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-08-01 14:53:34 +0200 |
| commit | ff1e7e64094185205a09eda71ef3c83a9fbcc75c (patch) | |
| tree | 79a6ed20fa026fcec3e65453de9f1387565c5ca6 /libmproxy/protocol | |
| parent | fa568c2d3bce7639d063e5d94de0aa8b2fcadf0e (diff) | |
| download | mitmproxy-ff1e7e64094185205a09eda71ef3c83a9fbcc75c.tar.gz mitmproxy-ff1e7e64094185205a09eda71ef3c83a9fbcc75c.tar.bz2 mitmproxy-ff1e7e64094185205a09eda71ef3c83a9fbcc75c.zip | |
fix imports for encoding
Diffstat (limited to 'libmproxy/protocol')
| -rw-r--r-- | libmproxy/protocol/http.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index a85a4f30..1b58f824 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -8,14 +8,14 @@ import urlparse from email.utils import parsedate_tz, formatdate, mktime_tz import netlib -from netlib import http, tcp, odict, utils +from netlib import http, tcp, odict, utils, encoding from netlib.http import cookies, http1, http2 from netlib.http.semantics import CONTENT_MISSING from .tcp import TCPHandler from .primitives import KILL, ProtocolHandler, Flow, Error from ..proxy.connection import ServerConnection -from .. import encoding, utils, controller, stateobject, proxy +from .. import utils, controller, stateobject, proxy from .http_wrappers import decoded, HTTPRequest, HTTPResponse |