1 files changed, 15 insertions, 17 deletions
diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py
index 17164a23a..edb5a2957 100644
--- a/qutebrowser/commands/userscripts.py
+++ b/qutebrowser/commands/userscripts.py
@@ -24,18 +24,16 @@ import os.path
 import tempfile
 from typing import cast, Any, MutableMapping, Tuple
 
-from qutebrowser.qt.core import pyqtSignal, pyqtSlot, QObject, QSocketNotifier
-
 import qutebrowser
 from qutebrowser.utils import message, log, objreg, standarddir, utils
 from qutebrowser.commands import runners
 from qutebrowser.config import websettings
 from qutebrowser.misc import guiprocess
 from qutebrowser.browser import downloads
-from qutebrowser.qt import sip
+from qutebrowser.qt import core, sip
 
 
-class _QtFIFOReader(QObject):
+class _QtFIFOReader(core.QObject):
 
     """A FIFO reader based on a QSocketNotifier.
 
@@ -48,7 +46,7 @@ class _QtFIFOReader(QObject):
         got_line: Emitted when a whole line arrived.
     """
 
-    got_line = pyqtSignal(str)
+    got_line = core.pyqtSignal(str)
 
     def __init__(self, filepath, parent=None):
         super().__init__(parent)
@@ -61,11 +59,11 @@ class _QtFIFOReader(QObject):
         fd = os.open(filepath, os.O_RDWR | os.O_NONBLOCK)
         # pylint: enable=no-member,useless-suppression
         self._fifo = os.fdopen(fd, 'r')
-        self._notifier = QSocketNotifier(cast(sip.voidptr, fd),
-                                         QSocketNotifier.Type.Read, self)
+        self._notifier = core.QSocketNotifier(cast(sip.voidptr, fd),
+                                         core.QSocketNotifier.Type.Read, self)
         self._notifier.activated.connect(self.read_line)
 
-    @pyqtSlot()
+    @core.pyqtSlot()
     def read_line(self):
         """(Try to) read a line from the FIFO."""
         log.procs.debug("QSocketNotifier triggered!")
@@ -91,7 +89,7 @@ class _QtFIFOReader(QObject):
         self._fifo.close()
 
 
-class _BaseUserscriptRunner(QObject):
+class _BaseUserscriptRunner(core.QObject):
 
     """Common part between the Windows and the POSIX userscript runners.
 
@@ -110,8 +108,8 @@ class _BaseUserscriptRunner(QObject):
                   arg: The finished GUIProcess object.
     """
 
-    got_cmd = pyqtSignal(str)
-    finished = pyqtSignal(guiprocess.GUIProcess)
+    got_cmd = core.pyqtSignal(str)
+    finished = core.pyqtSignal(guiprocess.GUIProcess)
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -216,7 +214,7 @@ class _BaseUserscriptRunner(QObject):
         """
         raise NotImplementedError
 
-    @pyqtSlot()
+    @core.pyqtSlot()
     def on_proc_finished(self):
         """Called when the process has finished.
 
@@ -224,7 +222,7 @@ class _BaseUserscriptRunner(QObject):
         """
         raise NotImplementedError
 
-    @pyqtSlot()
+    @core.pyqtSlot()
     def on_proc_error(self):
         """Called when the process encountered an error.
 
@@ -270,11 +268,11 @@ class _POSIXUserscriptRunner(_BaseUserscriptRunner):
         self._reader = _QtFIFOReader(self._filepath)
         self._reader.got_line.connect(self.got_cmd)
 
-    @pyqtSlot()
+    @core.pyqtSlot()
     def on_proc_finished(self):
         self._cleanup()
 
-    @pyqtSlot()
+    @core.pyqtSlot()
     def on_proc_error(self):
         self._cleanup()
 
@@ -327,11 +325,11 @@ class _WindowsUserscriptRunner(_BaseUserscriptRunner):
         super()._cleanup()
         self.finished.emit(proc)
 
-    @pyqtSlot()
+    @core.pyqtSlot()
     def on_proc_error(self):
         self._cleanup()
 
-    @pyqtSlot()
+    @core.pyqtSlot()
     def on_proc_finished(self):
         """Read back the commands when the process finished."""
         self._cleanup()