diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-03 18:07:30 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-03 18:07:30 +0200 |
| commit | adf2877020c563fa9dc9a4df26bfd8b243e8e41a (patch) | |
| tree | 6307f36b53c498b7d375c419adde4294c2a8d77e /libmproxy/main.py | |
| parent | 6cce2f14d7d44f2c13fe478624c921f6e71a2230 (diff) | |
| download | mitmproxy-adf2877020c563fa9dc9a4df26bfd8b243e8e41a.tar.gz mitmproxy-adf2877020c563fa9dc9a4df26bfd8b243e8e41a.tar.bz2 mitmproxy-adf2877020c563fa9dc9a4df26bfd8b243e8e41a.zip | |
fix #705
Diffstat (limited to 'libmproxy/main.py')
| -rw-r--r-- | libmproxy/main.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libmproxy/main.py b/libmproxy/main.py index e7d0f7e0..4dd6fdb1 100644 --- a/libmproxy/main.py +++ b/libmproxy/main.py @@ -3,7 +3,7 @@ import os import signal import sys import netlib.version -import netlib.version_check +from netlib.version_check import check_pyopenssl_version, check_mitmproxy_version from . import version, cmdline from .proxy import process_proxy_options, ProxyServerError from .proxy.server import DummyServer, ProxyServer @@ -39,7 +39,8 @@ def get_server(dummy_server, options): def mitmproxy(args=None): # pragma: nocover from . import console - netlib.version_check.version_check(version.IVERSION) + check_pyopenssl_version() + check_mitmproxy_version(version.IVERSION) assert_utf8_env() parser = cmdline.mitmproxy() @@ -67,7 +68,8 @@ def mitmproxy(args=None): # pragma: nocover def mitmdump(args=None): # pragma: nocover from . import dump - netlib.version_check.version_check(version.IVERSION) + check_pyopenssl_version() + check_mitmproxy_version(version.IVERSION) parser = cmdline.mitmdump() options = parser.parse_args(args) @@ -101,7 +103,9 @@ def mitmdump(args=None): # pragma: nocover def mitmweb(args=None): # pragma: nocover from . import web - netlib.version_check.version_check(version.IVERSION) + check_pyopenssl_version() + check_mitmproxy_version(version.IVERSION) + parser = cmdline.mitmweb() options = parser.parse_args(args) |