Move SignalEmittedError / CallbackCalledTwiceError to pytestqt.exceptions

Preparation for avoiding early wait_signal.py imports, but also seems more
consistent.

Author: The-Compiler

docs/wait_callback.rst

@@ -26,7 +26,7 @@ Anything following the ``with`` block will be run only after the callback has be
 
 If the callback doesn't get called during the given timeout,
 :class:`qtbot.TimeoutError <pytestqt.exceptions.TimeoutError>` is raised. If it is called more than once,
-:class:`qtbot.CallbackCalledTwiceError <pytestqt.wait_signal.CallbackCalledTwiceError>` is raised.
+:class:`qtbot.CallbackCalledTwiceError <pytestqt.exceptions.CallbackCalledTwiceError>` is raised.
 
 raising parameter
 -----------------

src/pytestqt/exceptions.py

@@ -116,3 +116,22 @@ class ScreenshotError(Exception):
 
         Access via ``qtbot.ScreenshotError``.
     """
+
+
+class SignalEmittedError(Exception):
+    """
+    .. versionadded:: 1.11
+
+    The exception thrown by :meth:`pytestqt.qtbot.QtBot.assertNotEmitted` if a
+    signal was emitted unexpectedly.
+    """
+
+
+class CallbackCalledTwiceError(Exception):
+    """
+    .. versionadded:: 3.1
+
+    The exception thrown by :meth:`pytestqt.qtbot.QtBot.waitCallback` if a
+    callback was called twice.
+    """
+

src/pytestqt/qtbot.py

@@ -2,15 +2,18 @@
 import weakref
 import warnings
 
-from pytestqt.exceptions import TimeoutError, ScreenshotError
+from pytestqt.exceptions import (
+    TimeoutError,
+    ScreenshotError,
+    SignalEmittedError,
+    CallbackCalledTwiceError,
+)
 from pytestqt.qt_compat import qt_api
 from pytestqt.wait_signal import (
     SignalBlocker,
     MultiSignalBlocker,
     SignalEmittedSpy,
-    SignalEmittedError,
     CallbackBlocker,
-    CallbackCalledTwiceError,
 )
 
 

src/pytestqt/wait_signal.py

@@ -1,6 +1,10 @@
 import functools
 
-from pytestqt.exceptions import TimeoutError
+from pytestqt.exceptions import (
+    TimeoutError,
+    SignalEmittedError,
+    CallbackCalledTwiceError,
+)
 from pytestqt.qt_compat import qt_api
 
 
@@ -710,24 +714,6 @@ def __exit__(self, type, value, traceback):
             self.wait()
 
 
-class SignalEmittedError(Exception):
-    """
-    .. versionadded:: 1.11
-
-    The exception thrown by :meth:`pytestqt.qtbot.QtBot.assertNotEmitted` if a
-    signal was emitted unexpectedly.
-    """
-
-
-class CallbackCalledTwiceError(Exception):
-    """
-    .. versionadded:: 3.1
-
-    The exception thrown by :meth:`pytestqt.qtbot.QtBot.waitCallback` if a
-    callback was called twice.
-    """
-
-
 def _silent_disconnect(signal, slot):
     """Disconnects a signal from a slot, ignoring errors. Sometimes
     Qt might disconnect a signal automatically for unknown reasons.

tests/test_wait_signal.py

@@ -5,10 +5,10 @@
 import sys
 
 from pytestqt.qt_compat import qt_api
-from pytestqt.wait_signal import (
+from pytestqt.wait_signal import SignalAndArgs
+from pytestqt.exceptions import (
     SignalEmittedError,
     TimeoutError,
-    SignalAndArgs,
     CallbackCalledTwiceError,
 )