Improve signature of __exit__

sebastinas · sebastinas · commit f51d61bb4eb2 · 2021-10-30T16:11:33.000+02:00
diff --git a/bpython/curtsiesfrontend/_internal.py b/bpython/curtsiesfrontend/_internal.py
@@ -21,6 +21,9 @@
 # THE SOFTWARE.
 
 import pydoc
+from types import TracebackType
+from typing import Optional, Literal, Type
+
 from .. import _internal
 
 
@@ -29,8 +32,14 @@ def __enter__(self):
         self._orig_pager = pydoc.pager
         pydoc.pager = self
 
-    def __exit__(self, *args):
+    def __exit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
+        exc_tb: Optional[TracebackType],
+    ) -> Literal[False]:
         pydoc.pager = self._orig_pager
+        return False
 
     def __call__(self, text):
         return None
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -12,8 +12,8 @@
 import time
 import unicodedata
 from enum import Enum
-
-from typing import Dict, Any, List, Optional, Tuple, Union, cast
+from types import TracebackType
+from typing import Dict, Any, List, Optional, Tuple, Union, cast, Literal, Type
 
 import blessings
 import greenlet
@@ -573,7 +573,12 @@ def __enter__(self):
         sitefix.monkeypatch_quit()
         return self
 
-    def __exit__(self, *args):
+    def __exit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
+        exc_tb: Optional[TracebackType],
+    ) -> Literal[False]:
         sys.stdin = self.orig_stdin
         sys.stdout = self.orig_stdout
         sys.stderr = self.orig_stderr
@@ -584,6 +589,7 @@ def __exit__(self, *args):
             signal.signal(signal.SIGTSTP, self.orig_sigtstp_handler)
 
         sys.meta_path = self.orig_meta_path
+        return False
 
     def sigwinch_handler(self, signum, frame):
         old_rows, old_columns = self.height, self.width
diff --git a/bpython/filelock.py b/bpython/filelock.py
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from typing import Optional, Type, IO
+from typing import Optional, Type, IO, Literal
 from types import TracebackType
 
 has_fcntl = True
@@ -59,9 +59,10 @@ def __exit__(
         exc_type: Optional[Type[BaseException]],
         exc: Optional[BaseException],
         exc_tb: Optional[TracebackType],
-    ) -> None:
+    ) -> Literal[False]:
         if self.locked:
             self.release()
+        return False
 
     def __del__(self) -> None:
         if self.locked:
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -26,11 +26,11 @@
 import pydoc
 import re
 from collections import namedtuple
+from typing import Any, Optional, Literal, Type
+from types import MemberDescriptorType, TracebackType
 
 from pygments.token import Token
 from pygments.lexers import Python3Lexer
-from typing import Any
-from types import MemberDescriptorType
 
 from .lazyre import LazyReCompile
 
@@ -88,7 +88,12 @@ def __enter__(self):
         self.attribs = (__getattribute__, __getattr__)
         # /Dark magic
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
+    def __exit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
+        exc_tb: Optional[TracebackType],
+    ) -> Literal[False]:
         """Restore an object's magic methods."""
         type_ = type(self.obj)
         __getattribute__, __getattr__ = self.attribs
@@ -98,6 +103,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         if __getattr__ is not None:
             setattr(type_, "__getattr__", __getattr__)
         # /Dark magic
+        return False
 
 
 class _Repr:
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -36,10 +36,11 @@
 from abc import abstractmethod
 from itertools import takewhile
 from pathlib import Path
+from types import ModuleType, TracebackType
+from typing import cast, Tuple, Any, Optional, Literal, Type
+
 from pygments.lexers import Python3Lexer
 from pygments.token import Token
-from types import ModuleType
-from typing import cast, Tuple, Any
 
 have_pyperclip = True
 try:
@@ -68,7 +69,12 @@ def __init__(self):
     def __enter__(self):
         self.start = self.time()
 
-    def __exit__(self, ty, val, tb):
+    def __exit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
+        exc_tb: Optional[TracebackType],
+    ) -> Literal[False]:
         self.last_command = self.time() - self.start
         self.running_time += self.last_command
         return False
