add more typing

Author: herobank110

src/pytestqt/__init__.py

@@ -1,4 +1,6 @@
+from typing import cast
+
 # _version is automatically generated by setuptools_scm
-from pytestqt._version import version
+from pytestqt._version import version  # type: ignore[import-not-found]
 
-__version__ = version
+__version__ = cast("str", version)

src/pytestqt/exceptions.py

@@ -2,10 +2,14 @@
 import sys
 import traceback
 from contextlib import contextmanager
+from types import TracebackType
+from typing import List, Tuple, Type
 
 import pytest
 from pytestqt.utils import get_marker
 
+CapturedException = Tuple[Type[BaseException], BaseException, TracebackType]
+CapturedExceptions = List[CapturedException]
 
 @contextmanager
 def capture_exceptions():

src/pytestqt/qt_compat.py

@@ -162,7 +162,7 @@ def exec(self, obj, *args, **kwargs):
 
     def get_versions(self):
         if self.pytest_qt_api == "pyside6":
-            import PySide6
+            import PySide6  # type: ignore[import-not-found]
 
             version = PySide6.__version__
 

src/pytestqt/qtbot.py

@@ -1,7 +1,9 @@
 import contextlib
+from types import TracebackType
 import weakref
 import warnings
-from typing import TYPE_CHECKING, Callable, Optional, Any, cast
+from typing import TYPE_CHECKING, Callable, Generator, Iterator, List, Literal, Optional, Any, Self, Type, cast
+from pathlib import Path
 
 from pytestqt.exceptions import TimeoutError, ScreenshotError
 from pytestqt.qt_compat import qt_api
@@ -12,17 +14,27 @@
     SignalEmittedError,
     CallbackBlocker,
     CallbackCalledTwiceError,
+    CheckParamsCb,
 )
 
+from pytest import FixtureRequest
+
+# Type hint objects until figuring out how to import across qt
+# versions possibly using 'qtpy' library.
+QWidget = Any
+SignalInstance = Any
+QRect = Any
+QKeySequence = Any
+
 if TYPE_CHECKING:
-    # Type hint objects until figuring out how to import across qt
-    # versions possibly using 'qtpy' library.
-    QWidget = Any
+    # Keep local import behavior the same.
+    from pytestqt.exceptions import CapturedExceptions
 
-BeforeCloseFunc = Callable[["QWidget"], None]
+BeforeCloseFunc = Callable[[QWidget], None]
+WaitSignalsOrder = Literal["none", "simple", "strict"]
 
 
-def _parse_ini_boolean(value: bool | str) -> bool:
+def _parse_ini_boolean(value: Any) -> bool:
     if value in (True, False):
         return cast("bool", value)
     try:
@@ -154,7 +166,7 @@ class QtBot:
 
     """
 
-    def __init__(self, request):
+    def __init__(self, request: FixtureRequest) -> None:
         self._request = request
         # pep8 aliases. Set here to automatically use implementations defined in sub-classes for alias creation
         self.add_widget = self.addWidget
@@ -168,7 +180,7 @@ def __init__(self, request):
         self.wait_until = self.waitUntil
         self.wait_callback = self.waitCallback
 
-    def _should_raise(self, raising_arg):
+    def _should_raise(self, raising_arg: Optional[bool]) -> bool:
         ini_val = self._request.config.getini("qt_default_raising")
 
         if raising_arg is not None:
@@ -178,7 +190,7 @@ def _should_raise(self, raising_arg):
         else:
             return True
 
-    def addWidget(self, widget, *, before_close_func: Optional[BeforeCloseFunc] = None):
+    def addWidget(self, widget: QWidget, *, before_close_func: Optional[BeforeCloseFunc] = None) -> None:
         """
         Adds a widget to be tracked by this bot. This is not required, but will ensure that the
         widget gets closed by the end of the test, so it is highly recommended.
@@ -196,7 +208,7 @@ def addWidget(self, widget, *, before_close_func: Optional[BeforeCloseFunc] = No
             raise TypeError(f"Need to pass a QWidget to addWidget: {widget!r}")
         _add_widget(self._request.node, widget, before_close_func=before_close_func)
 
-    def waitActive(self, widget, *, timeout: int = 5000):
+    def waitActive(self, widget: QWidget, *, timeout: int = 5000) -> "_WaitWidgetContextManager":
         """
         Context manager that waits for ``timeout`` milliseconds or until the window is active.
         If window is not exposed within ``timeout`` milliseconds, raise
@@ -223,7 +235,7 @@ def waitActive(self, widget, *, timeout: int = 5000):
             "qWaitForWindowActive", "activated", widget, timeout
         )
 
-    def waitExposed(self, widget, *, timeout=5000):
+    def waitExposed(self, widget: QWidget, *, timeout: int=5000) -> "_WaitWidgetContextManager":
         """
         Context manager that waits for ``timeout`` milliseconds or until the window is exposed.
         If the window is not exposed within ``timeout`` milliseconds, raise
@@ -250,7 +262,7 @@ def waitExposed(self, widget, *, timeout=5000):
             "qWaitForWindowExposed", "exposed", widget, timeout
         )
 
-    def waitForWindowShown(self, widget):
+    def waitForWindowShown(self, widget: QWidget) -> bool:
         """
         Waits until the window is shown in the screen. This is mainly useful for asynchronous
         systems like X11, where a window will be mapped to screen some time after being asked to
@@ -282,7 +294,7 @@ def waitForWindowShown(self, widget):
         )
         return qt_api.QtTest.QTest.qWaitForWindowExposed(widget)
 
-    def stop(self):
+    def stop(self) -> None:
         """
         Stops the current test flow, letting the user interact with any visible widget.
 
@@ -303,7 +315,14 @@ def stop(self):
         for widget, visible in widget_and_visibility:
             widget.setVisible(visible)
 
-    def waitSignal(self, signal, *, timeout=5000, raising=None, check_params_cb=None):
+    def waitSignal(
+        self,
+        signal: "SignalInstance",
+        *,
+        timeout: int = 5000,
+        raising: Optional[bool] = None,
+        check_params_cb: Optional[CheckParamsCb] = None,
+    ) -> "SignalBlocker":
         """
         .. versionadded:: 1.2
 
@@ -366,13 +385,13 @@ def waitSignal(self, signal, *, timeout=5000, raising=None, check_params_cb=None
 
     def waitSignals(
         self,
-        signals,
+        signals: List[SignalInstance],
         *,
-        timeout=5000,
-        raising=None,
-        check_params_cbs=None,
-        order="none",
-    ):
+        timeout: int=5000,
+        raising:Optional[bool]=None,
+        check_params_cbs:Optional[List[CheckParamsCb]] =None,
+        order: WaitSignalsOrder="none",
+    ) -> "MultiSignalBlocker":
         """
         .. versionadded:: 1.4
 
@@ -454,7 +473,7 @@ def waitSignals(
         blocker.add_signals(signals)
         return blocker
 
-    def wait(self, ms):
+    def wait(self, ms: int) -> None:
         """
         .. versionadded:: 1.9
 
@@ -467,7 +486,7 @@ def wait(self, ms):
         blocker.wait()
 
     @contextlib.contextmanager
-    def assertNotEmitted(self, signal, *, wait=0):
+    def assertNotEmitted(self, signal: SignalInstance, *, wait: int=0) -> Generator[None, None, None]:
         """
         .. versionadded:: 1.11
 
@@ -488,7 +507,7 @@ def assertNotEmitted(self, signal, *, wait=0):
             yield
         spy.assert_not_emitted()
 
-    def waitUntil(self, callback, *, timeout=5000):
+    def waitUntil(self, callback: Callable[[], Optional[bool]], *, timeout: int=5000) -> None:
         """
         .. versionadded:: 2.0
 
@@ -559,7 +578,7 @@ def timed_out():
                     raise TimeoutError(timeout_msg)
             self.wait(10)
 
-    def waitCallback(self, *, timeout=5000, raising=None):
+    def waitCallback(self, *, timeout: int = 5000, raising: Optional[bool] = None) -> "CallbackBlocker":
         """
         .. versionadded:: 3.1
 
@@ -601,7 +620,7 @@ def waitCallback(self, *, timeout=5000, raising=None):
         return blocker
 
     @contextlib.contextmanager
-    def captureExceptions(self):
+    def captureExceptions(self) -> Generator["CapturedExceptions", None, None]:
         """
         .. versionadded:: 2.1
 
@@ -625,9 +644,7 @@ def captureExceptions(self):
         with capture_exceptions() as exceptions:
             yield exceptions
 
-    capture_exceptions = captureExceptions
-
-    def screenshot(self, widget, suffix="", region=None):
+    def screenshot(self, widget: QWidget, suffix: str="", region: Optional[QRect]=None) -> Path:
         """
         .. versionadded:: 4.1
 
@@ -700,13 +717,13 @@ def keyRelease(*args, **kwargs):
         qt_api.QtTest.QTest.keyRelease(*args, **kwargs)
 
     @staticmethod
-    def keySequence(widget, key_sequence):
+    def keySequence(widget: QWidget, key_sequence: QKeySequence) -> None:
         if not hasattr(qt_api.QtTest.QTest, "keySequence"):
             raise NotImplementedError("This method is available from Qt 5.10 upwards.")
         qt_api.QtTest.QTest.keySequence(widget, key_sequence)
 
     @staticmethod
-    def keyToAscii(key):
+    def keyToAscii(key: Any) -> None:
         if not hasattr(qt_api.QtTest.QTest, "keyToAscii"):
             raise NotImplementedError("This method isn't available on PyQt5.")
         qt_api.QtTest.QTest.keyToAscii(key)
@@ -740,11 +757,11 @@ def mouseRelease(*args, **kwargs):
 
 
 def _add_widget(
-    item,
-    widget,
+    item: Any,
+    widget: QWidget,
     *,
     before_close_func: Optional[BeforeCloseFunc] = None,
-):
+) -> None:
     """
     Register a widget into the given pytest item for later closing.
     """
@@ -753,7 +770,7 @@ def _add_widget(
     item.qt_widgets = qt_widgets
 
 
-def _close_widgets(item):
+def _close_widgets(item: Any) -> None:
     """
     Close all widgets registered in the pytest item.
     """
@@ -769,7 +786,7 @@ def _close_widgets(item):
         del item.qt_widgets
 
 
-def _iter_widgets(item):
+def _iter_widgets(item: Any) -> Iterator[weakref.ReferenceType[QWidget]]:
     """
     Iterates over widgets registered in the given pytest item.
     """
@@ -782,7 +799,7 @@ class _WaitWidgetContextManager:
     Context manager implementation used by ``waitActive`` and ``waitExposed`` methods.
     """
 
-    def __init__(self, method_name, adjective_name, widget, timeout):
+    def __init__(self, method_name: str, adjective_name: str, widget: QWidget, timeout: int) -> None:
         """
         :param str method_name: name to the ``QtTest`` method to call to check if widget is active/exposed.
         :param str adjective_name: "activated" or "exposed".
@@ -794,11 +811,11 @@ def __init__(self, method_name, adjective_name, widget, timeout):
         self._widget = widget
         self._timeout = timeout
 
-    def __enter__(self):
+    def __enter__(self) -> Self:
         __tracebackhide__ = True
         return self
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
+    def __exit__(self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]) -> None:
         __tracebackhide__ = True
         try:
             if exc_type is None:

src/pytestqt/wait_signal.py

@@ -1,10 +1,11 @@
 import functools
 import dataclasses
-from typing import Any
+from typing import Any, Callable
 
 from pytestqt.exceptions import TimeoutError
 from pytestqt.qt_compat import qt_api
 
+CheckParamsCb = Callable[..., bool]
 
 class _AbstractSignalBlocker:
     """