Make types more allowing and run mypy in CI

Author: thomasballinger

.github/workflows/lint.yaml

@@ -26,3 +26,16 @@ jobs:
       with:
         skip: '*.po'
         ignore_words_list: te,ot
+
+  mypy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install mypy
+        pip install "blessings>=1.5" cwcwidth "backports.cached-property; python_version < '3.9'" pyte
+    - name: Check with mypy
+      run: python -m mypy

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [0.3.8] - 2021-09-27
+- Change typing of `event_trigger(event_type)` to allow a function that returns None
+
 ## [0.3.7] - 2021-09-27
 - Fixed ctrl-c not being reported until another key was pressed in Python 3.5+
 

curtsies/formatstring.py

@@ -137,7 +137,7 @@ def __len__(self) -> int:
 
     @property
     def width(self) -> int:
-        width = wcswidth(self._s)
+        width = wcswidth(self._s, None)
         if len(self._s) > 0 and width < 1:
             raise ValueError("Can't calculate width of string %r" % self._s)
         return width
@@ -240,7 +240,7 @@ def request(self, max_width: int) -> Optional[Tuple[int, Chunk]]:
         replacement_char = " "
 
         while True:
-            w = wcswidth(s[i])
+            w = wcswidth(s[i], None)
 
             # If adding a character puts us over the requested width, return what we've got so far
             if width + w > max_width:
@@ -644,7 +644,7 @@ def __getitem__(self, index: Union[int, slice]) -> "FmtStr":
 
     def width_aware_slice(self, index: Union[int, slice]) -> "FmtStr":
         """Slice based on the number of columns it would take to display the substring."""
-        if wcswidth(self.s) == -1:
+        if wcswidth(self.s, None) == -1:
             raise ValueError("bad values for width aware slicing")
         index = normalize_slice(self.width, index)
         counter = 0
@@ -672,7 +672,7 @@ def width_aware_splitlines(self, columns: int) -> Iterator["FmtStr"]:
         """
         if columns < 2:
             raise ValueError("Column width %s is too narrow." % columns)
-        if wcswidth(self.s) == -1:
+        if wcswidth(self.s, None) == -1:
             raise ValueError("bad values for width aware slicing")
         return self._width_aware_splitlines(columns)
 

curtsies/input.py

@@ -81,7 +81,7 @@ def __init__(
 
         self.readers: List[int] = []
         self.queued_interrupting_events: List[Union[events.Event, str]] = []
-        self.queued_events: List[events.Event] = []
+        self.queued_events: List[Union[events.Event, None]] = []
         self.queued_scheduled_events: List[Tuple[float, events.ScheduledEvent]] = []
 
     # prospective: this could be useful for an external select loop
@@ -313,7 +313,9 @@ def _nonblocking_read(self) -> int:
             else:
                 return 0
 
-    def event_trigger(self, event_type: Type[events.Event]) -> Callable:
+    def event_trigger(
+        self, event_type: Union[Type[events.Event], Callable[..., None]]
+    ) -> Callable:
         """Returns a callback that creates events.
 
         Returned callback function will add an event of type event_type