Skip to content

Commit 3506da8

Browse files
committed
wait_signal: Simplify utils
1 parent dcaebcf commit 3506da8

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

src/pytestqt/wait_signal.py

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import functools
2+
import dataclasses
3+
from typing import Any
24

35
from pytestqt.exceptions import (
46
TimeoutError,
@@ -261,12 +263,12 @@ def _get_timeout_error_message(self):
261263
)
262264

263265

266+
@dataclasses.dataclass
264267
class SignalAndArgs:
265-
def __init__(self, signal_name, args):
266-
self.signal_name = signal_name
267-
self.args = args
268+
signal_name: str
269+
args: list[Any]
268270

269-
def _get_readable_signal_with_optional_args(self):
271+
def __str__(self) -> str:
270272
args = repr(self.args) if self.args else ""
271273

272274
# remove signal parameter signature, e.g. turn "some_signal(str,int)" to "some_signal", because we're adding
@@ -276,18 +278,9 @@ def _get_readable_signal_with_optional_args(self):
276278

277279
return signal_name + args
278280

279-
def __str__(self):
280-
return self._get_readable_signal_with_optional_args()
281-
282-
def __eq__(self, other):
283-
if isinstance(other, self.__class__):
284-
return self.__dict__ == other.__dict__
285-
else:
286-
return False
287-
288281

289-
# Returns e.g. "3rd" for 3, or "21st" for 21
290-
def get_ordinal_str(n):
282+
def get_ordinal_str(n: int) -> str:
283+
"""Return e.g. "3rd" for 3, or "21st" for 21."""
291284
return "%d%s" % (n, {1: "st", 2: "nd", 3: "rd"}.get(n if n < 20 else n % 10, "th"))
292285

293286

0 commit comments

Comments
 (0)