Basic type checking in all files

thomasballinger · thomasballinger · commit 5b49dad298be · 2021-10-08T19:38:15.000-07:00
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -42,4 +42,4 @@ jobs:
         pip install types-backports types-requests types-setuptools types-toml types-pygments
     - name: Check with mypy
       # for now only run on a few files to avoid slipping backward
-      run: mypy bpython/autocomplete.py bpython/args.py bpython/config.py bpython/curtsies.py
+      run: mypy
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -50,7 +50,8 @@
 import struct
 import sys
 import time
-from typing import Iterator, NoReturn
+from typing import Iterator, NoReturn, List
+from typing_extensions import Literal
 import unicodedata
 from dataclasses import dataclass
 
@@ -144,7 +145,7 @@ def writelines(self, l) -> None:
         for s in l:
             self.write(s)
 
-    def isatty(self) -> True:
+    def isatty(self) -> Literal[True]:
         # some third party (amongst them mercurial) depend on this
         return True
 
@@ -161,7 +162,7 @@ def __init__(self, interface) -> None:
 
         self.encoding = getpreferredencoding()
         self.interface = interface
-        self.buffer = list()
+        self.buffer: List[str] = list()
 
     def __iter__(self) -> Iterator:
         return iter(self.readlines())
@@ -175,7 +176,7 @@ def write(self, value) -> NoReturn:
         # others, so here's a hack to keep them happy
         raise OSError(errno.EBADF, "sys.stdin is read-only")
 
-    def isatty(self) -> True:
+    def isatty(self) -> Literal[True]:
         return True
 
     def readline(self, size=-1):
diff --git a/bpython/test/test_crashers.py b/bpython/test/test_crashers.py
@@ -17,10 +17,10 @@
     from twisted.trial.unittest import TestCase as TrialTestCase
 except ImportError:
 
-    class TrialTestCase:
+    class TrialTestCase:  # type: ignore [no-redef]
         pass
 
-    reactor = None
+    reactor = None  # type: ignore
 
 try:
     import urwid
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -86,8 +86,7 @@ def test_last_word(self):
         self.assertEqual(curtsiesrepl._last_word("a"), "a")
         self.assertEqual(curtsiesrepl._last_word("a b"), "b")
 
-    # this is the behavior of bash - not currently implemented
-    @unittest.skip
+    @unittest.skip("this is the behavior of bash - not currently implemented")
     def test_get_last_word_with_prev_line(self):
         self.repl.rl_history.entries = ["1", "2 3", "4 5 6"]
         self.repl._set_current_line("abcde")
@@ -300,7 +299,7 @@ def test_simple(self):
         self.assertEqual(self.repl.predicted_indent("def asdf():"), 4)
         self.assertEqual(self.repl.predicted_indent("def asdf(): return 7"), 0)
 
-    @unittest.skip
+    @unittest.skip("This would be interesting")
     def test_complex(self):
         self.assertEqual(self.repl.predicted_indent("[a, "), 1)
         self.assertEqual(self.repl.predicted_indent("reduce(asdfasdf, "), 7)
diff --git a/bpython/test/test_inspection.py b/bpython/test/test_inspection.py
@@ -2,6 +2,9 @@
 import sys
 import unittest
 
+from typing import Optional
+from types import ModuleType
+
 from bpython import inspection
 from bpython.test.fodder import encoding_ascii
 from bpython.test.fodder import encoding_latin1
@@ -12,7 +15,7 @@
 try:
     import numpy
 except ImportError:
-    numpy = None
+    numpy = None  # type: ignore
 
 
 foo_ascii_only = '''def foo():
@@ -191,7 +194,7 @@ def __mro__(self):
     a = 1
 
 
-member_descriptor = type(Slots.s1)
+member_descriptor = type(Slots.s1)  # type: ignore
 
 
 class TestSafeGetAttribute(unittest.TestCase):
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -20,6 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+# This whole file typing TODO
+# type: ignore
 
 """bpython backend based on Urwid.
 
diff --git a/setup.cfg b/setup.cfg
@@ -74,3 +74,6 @@ files=bpython
 
 [mypy-jedi]
 ignore_missing_imports = True
+
+[mypy-urwid]
+ignore_missing_imports = True
