aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/__init__.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2014-03-10 17:24:05 +1300
committerAldo Cortesi <aldo@corte.si>2014-03-10 17:24:05 +1300
commit554deee222fa4d2100b93becc4dd06f7342e3694 (patch)
tree8acbf873630193e7bc34185f3a243e1aab408869 /libmproxy/protocol/__init__.py
parent2e50b1073538730fc5bd6369e2cb8176874f2f03 (diff)
parentdd3aedca01a61f2fe33d009320f7fe656f1fc671 (diff)
downloadmitmproxy-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/__init__.py')
-rw-r--r--libmproxy/protocol/__init__.py9
1 files changed, 1 insertions, 8 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):