Merge remote-tracking branch 'origin/a-better-future' into a-better-f…

…uture
learning-at-home · Jul 3, 2021 · cc113c9 · cc113c9
2 parents 9568979 + 1cd7fe4
commit cc113c9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/hivemind/utils/mpfuture.py b/hivemind/utils/mpfuture.py
@@ -162,7 +162,7 @@ def set_result(self, result: ResultType):
             self._state_cache[self._state], self._result = base.FINISHED, result
             self._send_update(UpdateType.RESULT, result)
 
-    def set_exception(self, exception: BaseException):
+    def set_exception(self, exception: Optional[BaseException]):
         if os.getpid() == self._origin_pid:
             super().set_exception(exception)
             MPFuture._active_futures.pop(self._uid, None)
@@ -204,7 +204,7 @@ def result(self, timeout: Optional[float] = None) -> ResultType:
         else:
             return self._result
 
-    def exception(self, timeout: Optional[float] = None) -> BaseException:
+    def exception(self, timeout: Optional[float] = None) -> Optional[BaseException]:
         if self._state not in TERMINAL_STATES:
             if os.getpid() != self._origin_pid:
                 raise RuntimeError("Only the process that created MPFuture can await exception")