From: "FeRD (Frank Dana)" Date: Mon, 20 Sep 2021 05:36:19 -0400 Subject: Preferences: Fix logging calls --- src/launch.py | 2 +- src/windows/preferences.py | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/launch.py b/src/launch.py index fa9ecb1..7a1d9ee 100755 --- a/src/launch.py +++ b/src/launch.py @@ -41,7 +41,7 @@ """ import sys -import os.path +import os import argparse from PyQt5.QtCore import Qt diff --git a/src/windows/preferences.py b/src/windows/preferences.py index bf7d67b..325f496 100644 --- a/src/windows/preferences.py +++ b/src/windows/preferences.py @@ -102,7 +102,7 @@ class Preferences(QDialog): def txtSearch_changed(self): """textChanged event handler for search box""" - log.info("Search for %s" % self.txtSearch.text()) + log.info("Search for %s", self.txtSearch.text()) # Populate preferences self.Populate(filter=self.txtSearch.text()) @@ -317,7 +317,7 @@ class Preferences(QDialog): value_list.remove(value_item) # Remove hardware mode items which cannot decode the example video - log.debug("Preparing to test hardware decoding: %s" % (value_list)) + log.debug("Preparing to test hardware decoding: %s", value_list) for value_item in list(value_list): v = value_item["value"] if (not self.testHardwareDecode(value_list, v, 0) @@ -470,7 +470,7 @@ class Preferences(QDialog): # Trigger specific actions if param["setting"] == "debug-mode": # Update debug setting of timeline - log.info("Setting debug-mode to %s" % (state == Qt.Checked)) + log.info("Setting debug-mode to %s", state == Qt.Checked) debug_enabled = (state == Qt.Checked) # Enable / Disable logger @@ -528,7 +528,9 @@ class Preferences(QDialog): if param.get("category") == "Keyboard": previous_value = value value = QKeySequence(value).toString() - log.info("Parsing keyboard mapping via QKeySequence from %s to %s" % (previous_value, value)) + log.info( + "Parsing keyboard mapping via QKeySequence from %s to %s", + previous_value, value) # Save setting self.s.set(param["setting"], value) @@ -604,11 +606,13 @@ class Preferences(QDialog): if reader.GetFrame(0).CheckPixel(0, 0, 2, 133, 255, 255, 5): is_supported = True self.hardware_tests_cards[decoder_card].append(int(decoder)) - log.debug("Successful hardware decoder! %s (%s-%s)" % (decoder_name, decoder, decoder_card)) + log.debug( + "Successful hardware decoder! %s (%s-%s)", + decoder_name, decoder, decoder_card) else: log.debug( "CheckPixel failed testing hardware decoding (i.e. wrong color found): %s (%s-%s)", - (decoder_name, decoder, decoder_card)) + decoder_name, decoder, decoder_card) reader.Close() clip.Close() @@ -616,7 +620,7 @@ class Preferences(QDialog): except Exception: log.debug( "Exception trying to test hardware decoding (this is expected): %s (%s-%s)", - (decoder_name, decoder, decoder_card)) + decoder_name, decoder, decoder_card) # Resume current settings openshot.Settings.Instance().HARDWARE_DECODER = current_decoder