aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2013-03-03 12:13:33 +1300
committerAldo Cortesi <aldo@nullcube.com>2013-03-03 12:13:33 +1300
commit2465b8a376a7eb04eef6a1cce46dd11a8f1830d8 (patch)
tree7f2cebe563ec824af8ad72eef982f745c5e4bc12 /libmproxy
parentd5876a12ed09940df77da823bf857437f7496524 (diff)
downloadmitmproxy-2465b8a376a7eb04eef6a1cce46dd11a8f1830d8.tar.gz
mitmproxy-2465b8a376a7eb04eef6a1cce46dd11a8f1830d8.tar.bz2
mitmproxy-2465b8a376a7eb04eef6a1cce46dd11a8f1830d8.zip
100% unit test coverage on proxy.py. Hallelujah!
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/proxy.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index 9fe878a9..75e195ea 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -504,10 +504,7 @@ class ProxyServer(tcp.TCPServer):
def handle_connection(self, request, client_address):
h = ProxyHandler(self.config, request, client_address, self, self.channel, self.server_version)
h.handle()
- try:
- h.finish()
- except tcp.NetLibDisconnect, e:
- pass
+ h.finish()
def handle_shutdown(self):
self.config.certstore.cleanup()
@@ -540,7 +537,7 @@ class DummyServer:
def __init__(self, config):
self.config = config
- def start_slave(self, klass, channel):
+ def start_slave(self, *args):
pass
def shutdown(self):