From 6eadff4a1047e72765e2082cc460442ffd81adee Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 14 May 2018 22:13:15 +0200 Subject: [PATCH] Add Python executable to :version --- qutebrowser/utils/version.py | 1 + tests/unit/utils/test_version.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 86973a3de..47e054bec 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -399,6 +399,7 @@ def version(): lines += [ 'Frozen: {}'.format(hasattr(sys, 'frozen')), "Imported from {}".format(importpath), + "Using Python from {}".format(sys.executable), "Qt library executable path: {}, data path: {}".format( QLibraryInfo.location(QLibraryInfo.LibraryExecutablesPath), QLibraryInfo.location(QLibraryInfo.DataPath) diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py index fe45fec97..683fba02e 100644 --- a/tests/unit/utils/test_version.py +++ b/tests/unit/utils/test_version.py @@ -874,6 +874,7 @@ def test_version_output(params, stubs, monkeypatch): '_git_str': lambda: ('GIT COMMIT' if params.git_commit else None), 'platform.python_implementation': lambda: 'PYTHON IMPLEMENTATION', 'platform.python_version': lambda: 'PYTHON VERSION', + 'sys.executable': 'EXECUTABLE PATH', 'PYQT_VERSION_STR': 'PYQT VERSION', 'earlyinit.qt_version': lambda: 'QT VERSION', '_module_versions': lambda: ['MODULE VERSION 1', 'MODULE VERSION 2'], @@ -897,6 +898,7 @@ def test_version_output(params, stubs, monkeypatch): 'qt': 'QT VERSION', 'frozen': str(params.frozen), 'import_path': import_path, + 'python_path': 'EXECUTABLE PATH', } if params.with_webkit: @@ -951,6 +953,7 @@ def test_version_output(params, stubs, monkeypatch): Platform: PLATFORM, ARCHITECTURE{linuxdist} Frozen: {frozen} Imported from {import_path} + Using Python from {python_path} Qt library executable path: QT PATH, data path: QT PATH {osinfo} Paths: