From ac09caefac7a33079e536b19f2329ebfd5539121 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Thu, 12 Nov 2015 23:13:37 +0000 Subject: [PATCH] [UI] Add Python and OS info to version output --- deluge/main.py | 6 ++++++ deluge/ui/ui.py | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/deluge/main.py b/deluge/main.py index 004e3202f..3f3a342fe 100644 --- a/deluge/main.py +++ b/deluge/main.py @@ -16,6 +16,7 @@ from __future__ import print_function import os +import platform import sys from errno import EEXIST from logging import FileHandler, getLogger @@ -34,6 +35,11 @@ def version_callback(option, opt_str, value, parser): print("libtorrent: %s" % lt.version) except ImportError: pass + print("Python: %s" % platform.python_version()) + for version in (platform.linux_distribution(), platform.win32_ver(), platform.mac_ver(), ("n/a",)): + if filter(None, version): # pylint: disable=bad-builtin + print("OS: %s %s" % (platform.system(), " ".join(version))) + break raise SystemExit diff --git a/deluge/ui/ui.py b/deluge/ui/ui.py index 32759dbec..8d671e831 100644 --- a/deluge/ui/ui.py +++ b/deluge/ui/ui.py @@ -11,6 +11,7 @@ from __future__ import print_function import logging import os +import platform import sys from optparse import OptionGroup, OptionParser @@ -32,6 +33,11 @@ def version_callback(option, opt_str, value, parser): print("libtorrent: %s" % lt.version) except ImportError: pass + print("Python: %s" % platform.python_version()) + for version in (platform.linux_distribution(), platform.win32_ver(), platform.mac_ver(), ("n/a",)): + if filter(None, version): # pylint: disable=bad-builtin + print("OS: %s %s" % (platform.system(), " ".join(version))) + break raise SystemExit DEFAULT_PREFS = {