Skip to content

Commit 3bbb8c5

Browse files
emaheuxPERENAbhiTheModder
emaheuxPEREN
authored and
AbhiTheModder
committed
typing: Remove generic @overload on handlers
Generic @overload definitions on signal handlers were masking type-checking errors.
1 parent ec20c95 commit 3bbb8c5

File tree

1 file changed

+12
-67
lines changed

1 file changed

+12
-67
lines changed

‎frida/core.py‎

Lines changed: 12 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,6 @@ def on(self, signal: Literal["destroyed"], callback: ScriptDestroyedCallback) ->
359359
@overload
360360
def on(self, signal: Literal["message"], callback: ScriptMessageCallback) -> None: ...
361361

362-
@overload
363-
def on(self, signal: str, callback: Callable[..., Any]) -> None: ...
364-
365362
def on(self, signal: str, callback: Callable[..., Any]) -> None:
366363
"""
367364
Add a signal handler
@@ -378,9 +375,6 @@ def off(self, signal: Literal["destroyed"], callback: ScriptDestroyedCallback) -
378375
@overload
379376
def off(self, signal: Literal["message"], callback: ScriptMessageCallback) -> None: ...
380377

381-
@overload
382-
def off(self, signal: str, callback: Callable[..., Any]) -> None: ...
383-
384378
def off(self, signal: str, callback: Callable[..., Any]) -> None:
385379
"""
386380
Remove a signal handler
@@ -701,34 +695,22 @@ def join_portal(
701695
_filter_missing_kwargs(kwargs)
702696
return PortalMembership(self._impl.join_portal(address, **kwargs))
703697

704-
@overload
705698
def on(
706699
self,
707700
signal: Literal["detached"],
708701
callback: SessionDetachedCallback,
709-
) -> None: ...
710-
711-
@overload
712-
def on(self, signal: str, callback: Callable[..., Any]) -> None: ...
713-
714-
def on(self, signal: str, callback: Callable[..., Any]) -> None:
702+
) -> None:
715703
"""
716704
Add a signal handler
717705
"""
718706

719707
self._impl.on(signal, callback)
720708

721-
@overload
722709
def off(
723710
self,
724711
signal: Literal["detached"],
725712
callback: SessionDetachedCallback,
726-
) -> None: ...
727-
728-
@overload
729-
def off(self, signal: str, callback: Callable[..., Any]) -> None: ...
730-
731-
def off(self, signal: str, callback: Callable[..., Any]) -> None:
713+
) -> None:
732714
"""
733715
Remove a signal handler
734716
"""
@@ -771,9 +753,6 @@ def on(self, signal: Literal["detached"], callback: BusDetachedCallback) -> None
771753
@overload
772754
def on(self, signal: Literal["message"], callback: BusMessageCallback) -> None: ...
773755

774-
@overload
775-
def on(self, signal: str, callback: Callable[..., Any]) -> None: ...
776-
777756
def on(self, signal: str, callback: Callable[..., Any]) -> None:
778757
"""
779758
Add a signal handler
@@ -790,9 +769,6 @@ def off(self, signal: Literal["detached"], callback: BusDetachedCallback) -> Non
790769
@overload
791770
def off(self, signal: Literal["message"], callback: BusMessageCallback) -> None: ...
792771

793-
@overload
794-
def off(self, signal: str, callback: Callable[..., Any]) -> None: ...
795-
796772
def off(self, signal: str, callback: Callable[..., Any]) -> None:
797773
"""
798774
Remove a signal handler
@@ -850,9 +826,6 @@ def on(self, signal: Literal["close"], callback: ServiceCloseCallback) -> None:
850826
@overload
851827
def on(self, signal: Literal["message"], callback: ServiceMessageCallback) -> None: ...
852828

853-
@overload
854-
def on(self, signal: str, callback: Callable[..., Any]) -> None: ...
855-
856829
def on(self, signal: str, callback: Callable[..., Any]) -> None:
857830
"""
858831
Add a signal handler
@@ -866,9 +839,6 @@ def off(self, signal: Literal["close"], callback: ServiceCloseCallback) -> None:
866839
@overload
867840
def off(self, signal: Literal["message"], callback: ServiceMessageCallback) -> None: ...
868841

869-
@overload
870-
def off(self, signal: str, callback: Callable[..., Any]) -> None: ...
871-
872842
def off(self, signal: str, callback: Callable[..., Any]) -> None:
873843
"""
874844
Remove a signal handler
@@ -1152,9 +1122,6 @@ def on(self, signal: Literal["uninjected"], callback: DeviceUninjectedCallback)
11521122
@overload
11531123
def on(self, signal: Literal["lost"], callback: DeviceLostCallback) -> None: ...
11541124

1155-
@overload
1156-
def on(self, signal: str, callback: Callable[..., Any]) -> None: ...
1157-
11581125
def on(self, signal: str, callback: Callable[..., Any]) -> None:
11591126
"""
11601127
Add a signal handler
@@ -1186,9 +1153,6 @@ def off(self, signal: Literal["uninjected"], callback: DeviceUninjectedCallback)
11861153
@overload
11871154
def off(self, signal: Literal["lost"], callback: DeviceLostCallback) -> None: ...
11881155

1189-
@overload
1190-
def off(self, signal: str, callback: Callable[..., Any]) -> None: ...
1191-
11921156
def off(self, signal: str, callback: Callable[..., Any]) -> None:
11931157
"""
11941158
Remove a signal handler
@@ -1306,9 +1270,6 @@ def on(self, signal: Literal["removed"], callback: DeviceManagerRemovedCallback)
13061270
@overload
13071271
def on(self, signal: Literal["changed"], callback: DeviceManagerChangedCallback) -> None: ...
13081272

1309-
@overload
1310-
def on(self, signal: str, callback: Callable[..., Any]) -> None: ...
1311-
13121273
def on(self, signal: str, callback: Callable[..., Any]) -> None:
13131274
"""
13141275
Add a signal handler
@@ -1325,9 +1286,6 @@ def off(self, signal: Literal["removed"], callback: DeviceManagerRemovedCallback
13251286
@overload
13261287
def off(self, signal: Literal["changed"], callback: DeviceManagerChangedCallback) -> None: ...
13271288

1328-
@overload
1329-
def off(self, signal: str, callback: Callable[..., Any]) -> None: ...
1330-
13311289
def off(self, signal: str, callback: Callable[..., Any]) -> None:
13321290
"""
13331291
Remove a signal handler
@@ -1498,9 +1456,6 @@ def on(self, signal: Literal["subscribe"], callback: PortalServiceSubscribeCallb
14981456
@overload
14991457
def on(self, signal: Literal["message"], callback: PortalServiceMessageCallback) -> None: ...
15001458

1501-
@overload
1502-
def on(self, signal: str, callback: Callable[..., Any]) -> None: ...
1503-
15041459
def on(self, signal: str, callback: Callable[..., Any]) -> None:
15051460
"""
15061461
Add a signal handler
@@ -1640,10 +1595,11 @@ def on(self, signal: Literal["output"], callback: CompilerOutputCallback) -> Non
16401595
@overload
16411596
def on(self, signal: Literal["diagnostics"], callback: CompilerDiagnosticsCallback) -> None: ...
16421597

1643-
@overload
1644-
def on(self, signal: str, callback: Callable[..., Any]) -> None: ...
1645-
16461598
def on(self, signal: str, callback: Callable[..., Any]) -> None:
1599+
"""
1600+
Add a signal handler
1601+
"""
1602+
16471603
self._impl.on(signal, callback)
16481604

16491605
@overload
@@ -1658,10 +1614,11 @@ def off(self, signal: Literal["output"], callback: CompilerOutputCallback) -> No
16581614
@overload
16591615
def off(self, signal: Literal["diagnostics"], callback: CompilerDiagnosticsCallback) -> None: ...
16601616

1661-
@overload
1662-
def off(self, signal: str, callback: Callable[..., Any]) -> None: ...
1663-
16641617
def off(self, signal: str, callback: Callable[..., Any]) -> None:
1618+
"""
1619+
Remove a signal handler
1620+
"""
1621+
16651622
self._impl.off(signal, callback)
16661623

16671624

@@ -1733,22 +1690,10 @@ def install(
17331690
_filter_missing_kwargs(kwargs)
17341691
return self._impl.install(**kwargs)
17351692

1736-
@overload
1737-
def on(self, signal: Literal["install-progress"], callback: PackageManagerInstallProgressCallback) -> None: ...
1738-
1739-
@overload
1740-
def on(self, signal: str, callback: Callable[..., Any]) -> None: ...
1741-
1742-
def on(self, signal: str, callback: Callable[..., Any]) -> None:
1693+
def on(self, signal: Literal["install-progress"], callback: PackageManagerInstallProgressCallback) -> None:
17431694
self._impl.on(signal, callback)
17441695

1745-
@overload
1746-
def off(self, signal: Literal["install-progress"], callback: PackageManagerInstallProgressCallback) -> None: ...
1747-
1748-
@overload
1749-
def off(self, signal: str, callback: Callable[..., Any]) -> None: ...
1750-
1751-
def off(self, signal: str, callback: Callable[..., Any]) -> None:
1696+
def off(self, signal: Literal["install-progress"], callback: PackageManagerInstallProgressCallback) -> None:
17521697
self._impl.off(signal, callback)
17531698

17541699

0 commit comments

Comments
 (0)