aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/utils
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2018-06-02 21:37:44 +0200
committerThomas Kriechbaumer <Kriechi@users.noreply.github.com>2018-06-02 21:37:44 +0200
commit09ff5df2fb354a017afa02138b329e615a80c1d0 (patch)
tree0472075396fdd789fab280eda2d82de294ee2146 /mitmproxy/utils
parent28bd1275b2f04b02cf71146d96eadc331744e39f (diff)
downloadmitmproxy-09ff5df2fb354a017afa02138b329e615a80c1d0.tar.gz
mitmproxy-09ff5df2fb354a017afa02138b329e615a80c1d0.tar.bz2
mitmproxy-09ff5df2fb354a017afa02138b329e615a80c1d0.zip
Such CI, Very Wow. (#3182)
Diffstat (limited to 'mitmproxy/utils')
-rw-r--r--mitmproxy/utils/debug.py16
1 files changed, 2 insertions, 14 deletions
diff --git a/mitmproxy/utils/debug.py b/mitmproxy/utils/debug.py
index e8eca906..c9ffb614 100644
--- a/mitmproxy/utils/debug.py
+++ b/mitmproxy/utils/debug.py
@@ -1,7 +1,6 @@
import gc
import os
import platform
-import re
import signal
import sys
import threading
@@ -13,21 +12,10 @@ from mitmproxy import version
def dump_system_info():
- mitmproxy_version = version.get_version(True, True)
- mitmproxy_version = re.sub(
- r"-0x([0-9a-f]+)",
- r" (commit \1)",
- mitmproxy_version
- )
-
- # PyInstaller builds indicator, if using precompiled binary
- if getattr(sys, 'frozen', False):
- bin_indicator = "binary"
- else:
- bin_indicator = ""
+ mitmproxy_version = version.get_dev_version()
data = [
- "Mitmproxy: {} {}".format(mitmproxy_version, bin_indicator),
+ "Mitmproxy: {}".format(mitmproxy_version),
"Python: {}".format(platform.python_version()),
"OpenSSL: {}".format(SSL.SSLeay_version(SSL.SSLEAY_VERSION).decode()),
"Platform: {}".format(platform.platform()),