diff options
| author | Aldo Cortesi <aldo@corte.si> | 2014-03-10 17:24:05 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2014-03-10 17:24:05 +1300 |
| commit | 554deee222fa4d2100b93becc4dd06f7342e3694 (patch) | |
| tree | 8acbf873630193e7bc34185f3a243e1aab408869 /libmproxy/protocol | |
| parent | 2e50b1073538730fc5bd6369e2cb8176874f2f03 (diff) | |
| parent | dd3aedca01a61f2fe33d009320f7fe656f1fc671 (diff) | |
| download | mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.tar.gz mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.tar.bz2 mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.zip | |
Merge pull request #233 from mitmproxy/untangle_circular_dependencies
Untangle circular dependencies
Diffstat (limited to 'libmproxy/protocol')
| -rw-r--r-- | libmproxy/protocol/__init__.py | 9 | ||||
| -rw-r--r-- | libmproxy/protocol/http.py | 10 | ||||
| -rw-r--r-- | libmproxy/protocol/primitives.py | 2 |
3 files changed, 8 insertions, 13 deletions
diff --git a/libmproxy/protocol/__init__.py b/libmproxy/protocol/__init__.py index 2c2e7285..6200757f 100644 --- a/libmproxy/protocol/__init__.py +++ b/libmproxy/protocol/__init__.py @@ -1,14 +1,7 @@ -from ..proxy import ServerConnection, AddressPriority +from libmproxy.proxy.primitives import AddressPriority KILL = 0 # const for killed requests -class ConnectionTypeChange(Exception): - """ - Gets raised if the connetion type has been changed (e.g. after HTTP/1.1 101 Switching Protocols). - It's up to the raising ProtocolHandler to specify the new conntype before raising the exception. - """ - pass - class ProtocolHandler(object): def __init__(self, c): diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 8a2583b1..77a09e61 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -1,11 +1,13 @@ import Cookie, urllib, urlparse, time, copy from email.utils import parsedate_tz, formatdate, mktime_tz +from libmproxy.proxy.primitives import AddressPriority +from ..proxy.connection import ServerConnection +from ..proxy.primitives import ProxyError, ConnectionTypeChange import netlib.utils -from netlib import http, tcp, http_status, odict +from netlib import http, tcp, http_status from netlib.odict import ODict, ODictCaseless -from . import ProtocolHandler, ConnectionTypeChange, KILL, TemporaryServerChangeMixin -from .. import encoding, utils, version, filt, controller, stateobject -from ..proxy import ProxyError, AddressPriority, ServerConnection +from . import ProtocolHandler, KILL, TemporaryServerChangeMixin +from .. import encoding, utils, filt, controller, stateobject from .primitives import Flow, Error diff --git a/libmproxy/protocol/primitives.py b/libmproxy/protocol/primitives.py index 90191eeb..f2701458 100644 --- a/libmproxy/protocol/primitives.py +++ b/libmproxy/protocol/primitives.py @@ -1,5 +1,5 @@ from .. import stateobject, utils, version -from ..proxy import ServerConnection, ClientConnection +from ..proxy.connection import ClientConnection, ServerConnection import copy |