diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2017-02-20 10:29:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 10:29:15 +0100 |
| commit | 51e08a5b85aa1428a1de0c0b72df6ae90ff890ad (patch) | |
| tree | 01707c1d819317936628021fa0632cc54ce39290 | |
| parent | 927a1ebab4fff7c45258380384c57eb3fdb941e7 (diff) | |
| parent | ed084f5413938d3246980c7885d37b7de8897916 (diff) | |
| download | mitmproxy-51e08a5b85aa1428a1de0c0b72df6ae90ff890ad.tar.gz mitmproxy-51e08a5b85aa1428a1de0c0b72df6ae90ff890ad.tar.bz2 mitmproxy-51e08a5b85aa1428a1de0c0b72df6ae90ff890ad.zip | |
Merge pull request #2041 from krsoninikhil/debug
Adds PyInstaller build indicator to --version argument
| -rw-r--r-- | mitmproxy/utils/debug.py | 6 | ||||
| -rw-r--r-- | test/mitmproxy/utils/test_debug.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mitmproxy/utils/debug.py b/mitmproxy/utils/debug.py index ff98b86c..c2eee2b6 100644 --- a/mitmproxy/utils/debug.py +++ b/mitmproxy/utils/debug.py @@ -37,8 +37,12 @@ def dump_system_info(): except: pass + bin_indicator = "" # PyInstaller builds indicator, if using precompiled binary + if getattr(sys, 'frozen', False): + bin_indicator = "Precompiled Binary" + data = [ - "Mitmproxy version: {} ({})".format(version.VERSION, git_describe), + "Mitmproxy version: {} ({}) {}".format(version.VERSION, git_describe, bin_indicator), "Python version: {}".format(platform.python_version()), "Platform: {}".format(platform.platform()), "SSL version: {}".format(SSL.SSLeay_version(SSL.SSLEAY_VERSION).decode()), diff --git a/test/mitmproxy/utils/test_debug.py b/test/mitmproxy/utils/test_debug.py index 22f8dc66..b6d6407c 100644 --- a/test/mitmproxy/utils/test_debug.py +++ b/test/mitmproxy/utils/test_debug.py @@ -1,11 +1,13 @@ import io import subprocess +import sys from unittest import mock from mitmproxy.utils import debug def test_dump_system_info(): + setattr(sys, 'frozen', True) assert debug.dump_system_info() with mock.patch('subprocess.check_output') as m: |