diff options
| -rw-r--r-- | mitmproxy/main.py | 7 | ||||
| -rw-r--r-- | netlib/version_check.py | 14 | ||||
| -rw-r--r-- | test/netlib/test_version_check.py | 13 |
3 files changed, 2 insertions, 32 deletions
diff --git a/mitmproxy/main.py b/mitmproxy/main.py index 31c1409e..d44c257e 100644 --- a/mitmproxy/main.py +++ b/mitmproxy/main.py @@ -3,8 +3,8 @@ import os import signal import sys from six.moves import _thread # PY3: We only need _thread.error, which is an alias of RuntimeError in 3.3+ -from netlib.version_check import check_pyopenssl_version, check_mitmproxy_version -from . import version, cmdline +from netlib.version_check import check_pyopenssl_version +from . import cmdline from .exceptions import ServerException from .proxy.server import DummyServer, ProxyServer from .proxy.config import process_proxy_options @@ -45,7 +45,6 @@ def mitmproxy(args=None): # pragma: no cover from . import console check_pyopenssl_version() - check_mitmproxy_version(version.IVERSION) assert_utf8_env() parser = cmdline.mitmproxy() @@ -76,7 +75,6 @@ def mitmdump(args=None): # pragma: no cover from . import dump check_pyopenssl_version() - check_mitmproxy_version(version.IVERSION) parser = cmdline.mitmdump() options = parser.parse_args(args) @@ -111,7 +109,6 @@ def mitmweb(args=None): # pragma: no cover from . import web check_pyopenssl_version() - check_mitmproxy_version(version.IVERSION) parser = cmdline.mitmweb() diff --git a/netlib/version_check.py b/netlib/version_check.py index 9cf27eea..8e05b458 100644 --- a/netlib/version_check.py +++ b/netlib/version_check.py @@ -15,20 +15,6 @@ from . import version PYOPENSSL_MIN_VERSION = (0, 15) -def check_mitmproxy_version(mitmproxy_version, fp=sys.stderr): - # We don't introduce backward-incompatible changes in patch versions. Only - # consider major and minor version. - if version.IVERSION[:2] != mitmproxy_version[:2]: - print( - u"You are using mitmproxy %s with netlib %s. " - u"Most likely, that won't work - please upgrade!" % ( - mitmproxy_version, version.VERSION - ), - file=fp - ) - sys.exit(1) - - def check_pyopenssl_version(min_version=PYOPENSSL_MIN_VERSION, fp=sys.stderr): min_version_str = u".".join(six.text_type(x) for x in min_version) try: diff --git a/test/netlib/test_version_check.py b/test/netlib/test_version_check.py index ec2396fe..680f80e0 100644 --- a/test/netlib/test_version_check.py +++ b/test/netlib/test_version_check.py @@ -4,19 +4,6 @@ from netlib import version_check, version @mock.patch("sys.exit") -def test_check_mitmproxy_version(sexit): - fp = StringIO() - version_check.check_mitmproxy_version(version.IVERSION, fp=fp) - assert not fp.getvalue() - assert not sexit.called - - b = (version.IVERSION[0] - 1, version.IVERSION[1]) - version_check.check_mitmproxy_version(b, fp=fp) - assert fp.getvalue() - assert sexit.called - - -@mock.patch("sys.exit") def test_check_pyopenssl_version(sexit): fp = StringIO() version_check.check_pyopenssl_version(fp=fp) |