Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity

fix #705

Browse Source
This commit is contained in:
Maximilian Hils 2015-08-03 18:07:30 +02:00
parent 6cce2f14d7
commit adf2877020
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmproxy/main.py
View File

@ -3,7 +3,7 @@ import os
import signal import signal
import sys import sys
import netlib.version import netlib.version
import netlib.version_check from netlib.version_check import check_pyopenssl_version, check_mitmproxy_version
from . import version, cmdline from . import version, cmdline
from .proxy import process_proxy_options, ProxyServerError from .proxy import process_proxy_options, ProxyServerError
from .proxy.server import DummyServer, ProxyServer from .proxy.server import DummyServer, ProxyServer
@ -39,7 +39,8 @@ def get_server(dummy_server, options):
def mitmproxy(args=None): # pragma: nocover def mitmproxy(args=None): # pragma: nocover
from . import console from . import console
netlib.version_check.version_check(version.IVERSION) check_pyopenssl_version()
check_mitmproxy_version(version.IVERSION)
assert_utf8_env() assert_utf8_env()
parser = cmdline.mitmproxy() parser = cmdline.mitmproxy()
@ -67,7 +68,8 @@ def mitmproxy(args=None): # pragma: nocover
def mitmdump(args=None): # pragma: nocover def mitmdump(args=None): # pragma: nocover
from . import dump from . import dump
netlib.version_check.version_check(version.IVERSION) check_pyopenssl_version()
check_mitmproxy_version(version.IVERSION)
parser = cmdline.mitmdump() parser = cmdline.mitmdump()
options = parser.parse_args(args) options = parser.parse_args(args)
@ -101,7 +103,9 @@ def mitmdump(args=None): # pragma: nocover
def mitmweb(args=None): # pragma: nocover def mitmweb(args=None): # pragma: nocover
from . import web from . import web
netlib.version_check.version_check(version.IVERSION) check_pyopenssl_version()
check_mitmproxy_version(version.IVERSION)
parser = cmdline.mitmweb() parser = cmdline.mitmweb()
options = parser.parse_args(args) options = parser.parse_args(args)