Drop remaining bits of QtCore.QObject.config and QtCore.QObject.log

metabrainz · Apr 24, 2024 · d7bb9dc · d7bb9dc
1 parent da4ff8c
commit d7bb9dc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/picard/tagger.py b/picard/tagger.py
@@ -331,10 +331,6 @@ def __init__(self, picard_args, localedir, autoupdate, pipe_handler=None):
         # log interesting environment variables
         log.debug("Qt Env.: %s", " ".join("%s=%r" % (k, v) for k, v in os.environ.items() if k.startswith('QT_')))
 
-        # for compatibility with pre-1.3 plugins
-        QtCore.QObject.config = config
-        QtCore.QObject.log = log
-
         check_io_encoding()
 
         # Must be before config upgrade because upgrade dialogs need to be

diff --git a/picard/ui/options/maintenance.py b/picard/ui/options/maintenance.py
@@ -255,7 +255,6 @@ def load_backup(self):
         if load_new_config(filename):
             config = get_config()
             upgrade_config(config)
-            QtCore.QObject.config = get_config()
             self.signal_reload.emit()
             dialog = QtWidgets.QMessageBox(
                 QtWidgets.QMessageBox.Icon.Information,

diff --git a/test/picardtestcase.py b/test/picardtestcase.py
@@ -58,9 +58,7 @@ class FakeTagger(QtCore.QObject):
     tagger_stats_changed = QtCore.pyqtSignal()
 
     def __init__(self):
-        QtCore.QObject.__init__(self)
-        QtCore.QObject.config = config
-        QtCore.QObject.log = log
+        super().__init__()
         self.tagger_stats_changed.connect(self.emit)
         self.exit_cleanup = []
         self.files = {}