Move shutdown_log() to qtlog

qutebrowser/misc/quitter.py

@@ -37,7 +37,7 @@ except ImportError:
 
 import qutebrowser
 from qutebrowser.api import cmdutils
-from qutebrowser.utils import log
+from qutebrowser.utils import log, qtlog
 from qutebrowser.misc import sessions, ipc, objects
 from qutebrowser.mainwindow import prompt
 from qutebrowser.completion.models import miscmodels
@@ -304,5 +304,5 @@ def init(args: argparse.Namespace) -> None:
     """Initialize the global Quitter instance."""
     global instance
     instance = Quitter(args=args, parent=objects.qapp)
-    instance.shutting_down.connect(log.shutdown_log)
+    instance.shutting_down.connect(qtlog.shutdown_log)
     objects.qapp.lastWindowClosed.connect(instance.on_last_window_closed)

qutebrowser/utils/log.py

@@ -213,11 +213,6 @@ def init_log(args: argparse.Namespace) -> None:
     _log_inited = True
 
 
-@qtcore.pyqtSlot()
-def shutdown_log() -> None:
-    qtcore.qInstallMessageHandler(None)
-
-
 def _init_py_warnings() -> None:
     """Initialize Python warning handling."""
     assert _args is not None

qutebrowser/utils/qtlog.py

@@ -16,3 +16,11 @@
 # along with qutebrowser.  If not, see <https://www.gnu.org/licenses/>.
 
 """Loggers and utilities related to Qt logging."""
+
+
+from qutebrowser.qt import core as qtcore
+
+
+@qtcore.pyqtSlot()
+def shutdown_log() -> None:
+    qtcore.qInstallMessageHandler(None)