Remove old qt_wait_signal_raising option

See #306

Author: The-Compiler

CHANGELOG.rst

@@ -29,6 +29,8 @@
   cumbersome and rarely used. Use ``qtbot.stop()`` (added in 1.1.1) instead.
 - The old ``SignalTimeoutError`` exception alias is now removed, as it was renamed to
   ``TimeoutError`` in 2.1.
+- The old ``qt_wait_signal_raising`` option is now removed, as it was renamed to
+  ``qt_default_raising`` in 3.1.
 - ``qtbot.waitSignal`` and ``waitSignals`` (as well as their PEP-8 aliases)
   supported passing ``None`` as signal, making them wait for the given timeout
   instead. This is not supported anymore, use ``qtbot.wait(ms)`` instead.

docs/signals.rst

@@ -70,8 +70,6 @@ value of the ``raising`` parameter of the ``qtbot.waitSignal`` and
 
 Calls which explicitly pass the ``raising`` parameter are not affected.
 
-This option was called ``qt_wait_signal_raising`` before 3.1.0.
-
 check_params_cb parameter
 -------------------------
 

src/pytestqt/plugin.py

@@ -1,5 +1,3 @@
-import warnings
-
 import pytest
 
 from pytestqt.exceptions import (
@@ -107,10 +105,6 @@ def pytest_addoption(parser):
         "qt_default_raising",
         "Default value for the raising parameter of qtbot.waitSignal/waitCallback",
     )
-    parser.addini(
-        "qt_wait_signal_raising",
-        "Default value for the raising parameter of qtbot.waitSignal (legacy alias)",
-    )
     parser.addini(
         "qt_qapp_name", "The Qt application name to use", default="pytest-qt-qapp"
     )
@@ -220,12 +214,6 @@ def pytest_configure(config):
 
     qt_api.set_qt_api(config.getini("qt_api"))
 
-    if config.getini("qt_wait_signal_raising"):
-        warnings.warn(
-            "qt_wait_signal_raising is deprecated, use qt_default_raising instead.",
-            DeprecationWarning,
-        )
-
 
 def pytest_report_header():
     from pytestqt.qt_compat import qt_api

src/pytestqt/qtbot.py

@@ -140,12 +140,9 @@ def __init__(self, request):
 
     def _should_raise(self, raising_arg):
         ini_val = self._request.config.getini("qt_default_raising")
-        legacy_ini_val = self._request.config.getini("qt_wait_signal_raising")
 
         if raising_arg is not None:
             return raising_arg
-        elif legacy_ini_val:
-            return _parse_ini_boolean(legacy_ini_val)
         elif ini_val:
             return _parse_ini_boolean(ini_val)
         else:

tests/test_wait_signal.py

@@ -148,16 +148,13 @@ def test_zero_timeout(qtbot, timer, delayed, signaller):
 @pytest.mark.parametrize(
     "configval, raises", [("false", False), ("true", True), (None, True)]
 )
-@pytest.mark.parametrize("configkey", ["qt_wait_signal_raising", "qt_default_raising"])
-def test_raising(qtbot, testdir, configkey, configval, raises):
+def test_raising(qtbot, testdir, configval, raises):
     if configval is not None:
         testdir.makeini(
-            """
+            f"""
             [pytest]
-            {} = {}
-        """.format(
-                configkey, configval
-            )
+            qt_default_raising = {configval}
+        """
         )
 
     testdir.makepyfile(
@@ -176,28 +173,20 @@ def test_foo(qtbot):
     """
     )
 
-    if configkey == "qt_wait_signal_raising" and configval is not None:
-        with pytest.warns(DeprecationWarning):
-            res = testdir.runpytest()
-    else:
-        res = testdir.runpytest()
+    res = testdir.runpytest()
 
     if raises:
         res.stdout.fnmatch_lines(["*1 failed*"])
     else:
         res.stdout.fnmatch_lines(["*1 passed*"])
 
 
-@pytest.mark.filterwarnings("ignore:qt_wait_signal_raising is deprecated")
-@pytest.mark.parametrize("configkey", ["qt_wait_signal_raising", "qt_default_raising"])
-def test_raising_by_default_overridden(qtbot, testdir, configkey):
+def test_raising_by_default_overridden(qtbot, testdir):
     testdir.makeini(
         """
         [pytest]
-        {} = false
-    """.format(
-            configkey
-        )
+        qt_default_raising = false
+    """
     )
 
     testdir.makepyfile(