|
4 | 4 | from threading import Event
|
5 | 5 | from time import monotonic, sleep
|
6 | 6 | from typing import Callable, Dict, Any, Iterator, Iterable, Optional, Union
|
7 |
| -from types import FrameType |
8 | 7 | # Third party modules
|
9 | 8 | # Local modules
|
10 | 9 | # Program
|
@@ -110,15 +109,14 @@ class HardSignal(BaseSignal):
|
110 | 109 |
|
111 | 110 | class Signal(HardSignal):
|
112 | 111 | _handler:Optional[Signal] = None
|
113 |
| - softKillFn:Optional[Callable[[Signals, FrameType], Any]] |
114 |
| - hardKillFn:Optional[Callable[[Signals, FrameType], Any]] |
| 112 | + softKillFn:Optional[Callable[..., Any]] |
| 113 | + hardKillFn:Optional[Callable[..., Any]] |
115 | 114 | forceKillCounterFn:Optional[Callable[[int, int], Any]]
|
116 | 115 | counter:int
|
117 | 116 | forceCounter:int
|
118 | 117 | eSoft:Event
|
119 | 118 | eHard:Event
|
120 |
| - def __init__(self, softKillFn:Optional[Callable[[Signals, FrameType], Any]]=None, |
121 |
| - hardKillFn:Optional[Callable[[Signals, FrameType], Any]]=None, |
| 119 | + def __init__(self, softKillFn:Optional[Callable[..., Any]]=None, hardKillFn:Optional[Callable[..., Any]]=None, |
122 | 120 | forceKillCounterFn:Optional[Callable[[int, int], Any]]=None, forceCounter:int=10):
|
123 | 121 | self.softKillFn = softKillFn
|
124 | 122 | self.hardKillFn = hardKillFn
|
@@ -182,15 +180,15 @@ def _softKill(self) -> None:
|
182 | 180 | self.eSoft.set()
|
183 | 181 | if callable(self.softKillFn):
|
184 | 182 | try:
|
185 |
| - self.softKillFn() # type: ignore |
| 183 | + self.softKillFn() |
186 | 184 | except:
|
187 | 185 | traceback.print_exc()
|
188 | 186 | def _hardKill(self) -> None:
|
189 | 187 | if not self.eHard.is_set():
|
190 | 188 | self.eHard.set()
|
191 | 189 | if callable(self.hardKillFn):
|
192 | 190 | try:
|
193 |
| - self.hardKillFn() # type: ignore |
| 191 | + self.hardKillFn() |
194 | 192 | except:
|
195 | 193 | traceback.print_exc()
|
196 | 194 | def _reset(self) -> None:
|
|
0 commit comments