diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-01-31 01:06:35 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-31 01:06:35 +0100 |
| commit | 6ce1470631e843bef926d9fee5c2ad1f359dc0ac (patch) | |
| tree | b80fc4b36ca4a331e67af4f1a5f77c4e6c289c35 /libmproxy/protocol | |
| parent | 5fce7be592dfe1ab922044862cc34afa486986d5 (diff) | |
| download | mitmproxy-6ce1470631e843bef926d9fee5c2ad1f359dc0ac.tar.gz mitmproxy-6ce1470631e843bef926d9fee5c2ad1f359dc0ac.tar.bz2 mitmproxy-6ce1470631e843bef926d9fee5c2ad1f359dc0ac.zip | |
move StateObject back into libmproxy
Diffstat (limited to 'libmproxy/protocol')
| -rw-r--r-- | libmproxy/protocol/__init__.py | 2 | ||||
| -rw-r--r-- | libmproxy/protocol/http.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/protocol/__init__.py b/libmproxy/protocol/__init__.py index 5e11e750..ae0d99a6 100644 --- a/libmproxy/protocol/__init__.py +++ b/libmproxy/protocol/__init__.py @@ -26,7 +26,7 @@ class ProtocolHandler(object): This method gets called should there be an uncaught exception during the connection. This might happen outside of handle_messages, e.g. if the initial SSL handshake fails in transparent mode. """ - raise NotImplementedError + raise error from . import http, tcp diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index a33962a6..11735ec0 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -1,10 +1,10 @@ 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, stateobject, odict +from netlib import http, tcp, http_status, odict from netlib.odict import ODict, ODictCaseless from . import ProtocolHandler, ConnectionTypeChange, KILL -from .. import encoding, utils, version, filt, controller +from .. import encoding, utils, version, filt, controller, stateobject from ..proxy import ProxyError, ClientConnection, ServerConnection HDR_FORM_URLENCODED = "application/x-www-form-urlencoded" |