aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/main.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-30 03:23:57 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-30 03:23:57 +0200
commit21e7f420d2870d89ebc05181c1fca674d80e4e7c (patch)
tree663f013071f1127b7eeef2be00128d9f2fc432ef /libmproxy/main.py
parent1dd09a5509219e7390abbb8c0b6818c7e792daa1 (diff)
downloadmitmproxy-21e7f420d2870d89ebc05181c1fca674d80e4e7c.tar.gz
mitmproxy-21e7f420d2870d89ebc05181c1fca674d80e4e7c.tar.bz2
mitmproxy-21e7f420d2870d89ebc05181c1fca674d80e4e7c.zip
minor fixes
Diffstat (limited to 'libmproxy/main.py')
-rw-r--r--libmproxy/main.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/main.py b/libmproxy/main.py
index 4dd6fdb1..faef8c82 100644
--- a/libmproxy/main.py
+++ b/libmproxy/main.py
@@ -2,11 +2,11 @@ from __future__ import print_function, absolute_import
import os
import signal
import sys
-import netlib.version
from netlib.version_check import check_pyopenssl_version, check_mitmproxy_version
from . import version, cmdline
-from .proxy import process_proxy_options, ProxyServerError
+from .exceptions import ServerException
from .proxy.server import DummyServer, ProxyServer
+from .proxy.config import process_proxy_options
def assert_utf8_env():
@@ -31,7 +31,7 @@ def get_server(dummy_server, options):
else:
try:
return ProxyServer(options)
- except ProxyServerError as v:
+ except ServerException as v:
print(str(v), file=sys.stderr)
sys.exit(1)