Add type hints to twisted.internet.task.

hrnciar · Mar 27, 2021 · fadb582 · fadb582
1 parent 083c1c3
commit fadb582
Show file tree

Hide file tree

Showing 6 changed files with 191 additions and 145 deletions.
diff --git a/mypy.ini b/mypy.ini
@@ -253,11 +253,6 @@ check_untyped_defs = False
 allow_untyped_defs = True
 check_untyped_defs = False
 
-[mypy-twisted.internet.task]
-allow_untyped_defs = True
-check_untyped_defs = False
-allow_incomplete_defs = True
-
 [mypy-twisted.internet.tcp]
 allow_untyped_defs = True
 check_untyped_defs = False

diff --git a/src/twisted/internet/base.py b/src/twisted/internet/base.py
@@ -19,6 +19,7 @@
     AnyStr,
     Callable,
     Dict,
+    Iterable,
     List,
     Mapping,
     NewType,
@@ -237,13 +238,14 @@ def __repr__(self) -> str:
         if hasattr(self, "func"):
             # This code should be replaced by a utility function in reflect;
             # see ticket #6066:
-            if hasattr(self.func, "__qualname__"):
-                func: Optional[str] = self.func.__qualname__
-            elif hasattr(self.func, "__name__"):
-                func = self.func.func_name  # type: ignore[attr-defined]
-                if hasattr(self.func, "im_class"):
-                    func = self.func.im_class.__name__ + "." + func  # type: ignore[attr-defined]
-            else:
+            func = getattr(self.func, "__qualname__", None)
+            if func is None:
+                func = getattr(self.func, "__name__", None)
+                if func is not None:
+                    imClass = getattr(self.func, "im_class", None)
+                    if imClass is not None:
+                        func = f"{imClass}.{func}"
+            if func is None:
                 func = reflect.safe_repr(self.func)
         else:
             func = None
@@ -907,7 +909,7 @@ def _moveCallLaterSooner(self, delayedCall: DelayedCall) -> None:
     def _cancelCallLater(self, delayedCall: DelayedCall) -> None:
         self._cancellations += 1
 
-    def getDelayedCalls(self) -> List[IDelayedCall]:
+    def getDelayedCalls(self) -> Iterable[IDelayedCall]:
         """
         Return all the outstanding delayed calls in the system.
         They are returned in no particular order.

diff --git a/src/twisted/internet/defer.py b/src/twisted/internet/defer.py
@@ -631,7 +631,7 @@ def chainDeferred(self, d: "Deferred[_DeferredResultT]") -> "Deferred[None]":
         d._chainedTo = self
         return self.addCallbacks(d.callback, d.errback)
 
-    def callback(self, result: _DeferredResultT) -> None:
+    def callback(self, result: Union[_DeferredResultT, Failure]) -> None:
         """
         Run all success callbacks that have been added to this L{Deferred}.
 

diff --git a/src/twisted/internet/interfaces.py b/src/twisted/internet/interfaces.py
@@ -1194,11 +1194,11 @@ def callLater(
                  C{reset()} methods.
         """
 
-    def getDelayedCalls() -> List["IDelayedCall"]:
+    def getDelayedCalls() -> Iterable["IDelayedCall"]:
         """
         Retrieve all currently scheduled delayed calls.
 
-        @return: A list of L{IDelayedCall} providers representing all
+        @return: An iterable of L{IDelayedCall} providers representing all
                  currently scheduled calls. This is everything that has been
                  returned by C{callLater} but not yet called or cancelled.
         """