aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/main.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-05-31 01:51:31 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-05-31 01:51:31 +0200
commitec92fca8c030fe5971a034a658033f70965b990a (patch)
treeef9a2049eeab539d13e1f9662fd51220ab4ee817 /libmproxy/main.py
parent0f8e8ee1ad667c8d747d5876f9b630ecbc01d7e9 (diff)
parenta05a70d8168a07c92b2a3ecbbb1958d85532efe3 (diff)
downloadmitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.tar.gz
mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.tar.bz2
mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.zip
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/main.py')
-rw-r--r--libmproxy/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/main.py b/libmproxy/main.py
index 32ab738e..73e6c62b 100644
--- a/libmproxy/main.py
+++ b/libmproxy/main.py
@@ -70,7 +70,7 @@ def get_server(dummy_server, options):
else:
try:
return ProxyServer(options)
- except ProxyServerError, v:
+ except ProxyServerError as v:
print(str(v), file=sys.stderr)
sys.exit(1)