rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add Python executable to :version

Browse Source
This commit is contained in:
Florian Bruhin 2018-05-14 22:13:15 +02:00
parent 48c44e1b4d
commit 6eadff4a10
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/utils/version.py
View File

@ -399,6 +399,7 @@ def version():
lines += [ lines += [
'Frozen: {}'.format(hasattr(sys, 'frozen')), 'Frozen: {}'.format(hasattr(sys, 'frozen')),
"Imported from {}".format(importpath), "Imported from {}".format(importpath),
"Using Python from {}".format(sys.executable),
"Qt library executable path: {}, data path: {}".format( "Qt library executable path: {}, data path: {}".format(
QLibraryInfo.location(QLibraryInfo.LibraryExecutablesPath), QLibraryInfo.location(QLibraryInfo.LibraryExecutablesPath),
QLibraryInfo.location(QLibraryInfo.DataPath) QLibraryInfo.location(QLibraryInfo.DataPath)

3
tests/unit/utils/test_version.py
View File

@ -874,6 +874,7 @@ def test_version_output(params, stubs, monkeypatch):
'_git_str': lambda: ('GIT COMMIT' if params.git_commit else None), '_git_str': lambda: ('GIT COMMIT' if params.git_commit else None),
'platform.python_implementation': lambda: 'PYTHON IMPLEMENTATION', 'platform.python_implementation': lambda: 'PYTHON IMPLEMENTATION',
'platform.python_version': lambda: 'PYTHON VERSION', 'platform.python_version': lambda: 'PYTHON VERSION',
'sys.executable': 'EXECUTABLE PATH',
'PYQT_VERSION_STR': 'PYQT VERSION', 'PYQT_VERSION_STR': 'PYQT VERSION',
'earlyinit.qt_version': lambda: 'QT VERSION', 'earlyinit.qt_version': lambda: 'QT VERSION',
'_module_versions': lambda: ['MODULE VERSION 1', 'MODULE VERSION 2'], '_module_versions': lambda: ['MODULE VERSION 1', 'MODULE VERSION 2'],
@ -897,6 +898,7 @@ def test_version_output(params, stubs, monkeypatch):
'qt': 'QT VERSION', 'qt': 'QT VERSION',
'frozen': str(params.frozen), 'frozen': str(params.frozen),
'import_path': import_path, 'import_path': import_path,
'python_path': 'EXECUTABLE PATH',
} }
if params.with_webkit: if params.with_webkit:
@ -951,6 +953,7 @@ def test_version_output(params, stubs, monkeypatch):
Platform: PLATFORM, ARCHITECTURE{linuxdist} Platform: PLATFORM, ARCHITECTURE{linuxdist}
Frozen: {frozen} Frozen: {frozen}
Imported from {import_path} Imported from {import_path}
Using Python from {python_path}
Qt library executable path: QT PATH, data path: QT PATH Qt library executable path: QT PATH, data path: QT PATH
{osinfo} {osinfo}
Paths: Paths: