aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy/connection.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-03 20:12:30 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-03 20:12:30 +0200
commitcd43c5ba9c2981aeffee354cbcb574b6f5e435ba (patch)
tree025f4a55f2db9a1d9d418e338a638340de0ead4a /libmproxy/proxy/connection.py
parentb0cfeff06d9dd99a16dfae19c5df3c73c5864fb9 (diff)
downloadmitmproxy-cd43c5ba9c2981aeffee354cbcb574b6f5e435ba.tar.gz
mitmproxy-cd43c5ba9c2981aeffee354cbcb574b6f5e435ba.tar.bz2
mitmproxy-cd43c5ba9c2981aeffee354cbcb574b6f5e435ba.zip
simplify server changes for inline scripts
Diffstat (limited to 'libmproxy/proxy/connection.py')
-rw-r--r--libmproxy/proxy/connection.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/libmproxy/proxy/connection.py b/libmproxy/proxy/connection.py
index d99ffa9b..5c421557 100644
--- a/libmproxy/proxy/connection.py
+++ b/libmproxy/proxy/connection.py
@@ -72,9 +72,8 @@ class ClientConnection(tcp.BaseHandler, stateobject.SimpleStateObject):
class ServerConnection(tcp.TCPClient, stateobject.SimpleStateObject):
- def __init__(self, address, priority):
+ def __init__(self, address):
tcp.TCPClient.__init__(self, address)
- self.priority = priority
self.state = [] # a list containing (conntype, state) tuples
self.peername = None
@@ -131,7 +130,7 @@ class ServerConnection(tcp.TCPClient, stateobject.SimpleStateObject):
@classmethod
def _from_state(cls, state):
- f = cls(tuple(), None)
+ f = cls(tuple())
f._load_state(state)
return f