From e0f711cda3e9f2cac0ab09e5ce18596394e8fe90 Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Tue, 18 Jul 2017 18:39:43 +0200 Subject: [PATCH] Display astrcmp implementation (C or Python) in About and debug log It can also be displayed using -V command line option along various libs versions --- picard/util/astrcmp.py | 2 ++ picard/util/versions.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/picard/util/astrcmp.py b/picard/util/astrcmp.py index 6822bc58f..60dbe0577 100644 --- a/picard/util/astrcmp.py +++ b/picard/util/astrcmp.py @@ -36,5 +36,7 @@ def astrcmp_py(a,b): try: from picard.util._astrcmp import astrcmp as astrcmp_c astrcmp = astrcmp_c + astrcmp_implementation = "C" except ImportError: astrcmp = astrcmp_py + astrcmp_implementation = "Python" diff --git a/picard/util/versions.py b/picard/util/versions.py index 6d774343f..53752c53a 100644 --- a/picard/util/versions.py +++ b/picard/util/versions.py @@ -23,6 +23,7 @@ from mutagen import version_string as mutagen_version from PyQt5.QtCore import PYQT_VERSION_STR as pyqt_version, QT_VERSION_STR from picard import PICARD_FANCY_VERSION_STR from picard.disc import discid_version +from picard.util.astrcmp import astrcmp_implementation _versions = OrderedDict([ @@ -31,6 +32,7 @@ _versions = OrderedDict([ ("qt-version", QT_VERSION_STR), ("mutagen-version", mutagen_version), ("discid-version", discid_version), + ("astrcmp", astrcmp_implementation), ]) _names = { @@ -39,6 +41,7 @@ _names = { "qt-version": "Qt", "mutagen-version": "Mutagen", "discid-version": "Discid", + "astrcmp": "astrcmp", }