Upgrade code to Python 3.9

Author: sebastinas

curtsies/configfile_keynames.py

@@ -15,7 +15,7 @@
 class KeyMap:
     """Maps config file key syntax to Curtsies names"""
 
-    def __getitem__(self, key: str) -> Tuple[str, ...]:
+    def __getitem__(self, key: str) -> tuple[str, ...]:
         if not key:  # Unbound key
             return ()
         elif key in SPECIALS:

curtsies/escseqparse.py

@@ -11,15 +11,15 @@
 
 from typing import (
     List,
-    Mapping,
     Union,
     Tuple,
-    Match,
     cast,
     Dict,
     Any,
     Optional,
 )
+from collections.abc import Mapping
+from re import Match
 
 import re
 
@@ -34,14 +34,14 @@
 )
 
 
-Token = Dict[str, Union[str, List[int]]]
+Token = dict[str, Union[str, list[int]]]
 
 
 def remove_ansi(s: str) -> str:
     return re.sub(r"(\x9B|\x1B\[)[0-?]*[ -\/]*[@-~]", "", s)
 
 
-def parse(s: str) -> List[Union[str, Dict[str, Union[str, bool, None]]]]:
+def parse(s: str) -> list[Union[str, dict[str, Union[str, bool, None]]]]:
     r"""
     Returns a list of strings or format dictionaries to describe the strings.
 
@@ -52,7 +52,7 @@ def parse(s: str) -> List[Union[str, Dict[str, Union[str, bool, None]]]]:
     >>> parse("\x1b[33m[\x1b[39m\x1b[33m]\x1b[39m\x1b[33m[\x1b[39m\x1b[33m]\x1b[39m\x1b[33m[\x1b[39m\x1b[33m]\x1b[39m\x1b[33m[\x1b[39m")
     [{'fg': 'yellow'}, '[', {'fg': None}, {'fg': 'yellow'}, ']', {'fg': None}, {'fg': 'yellow'}, '[', {'fg': None}, {'fg': 'yellow'}, ']', {'fg': None}, {'fg': 'yellow'}, '[', {'fg': None}, {'fg': 'yellow'}, ']', {'fg': None}, {'fg': 'yellow'}, '[', {'fg': None}]
     """
-    stuff: List[Union[str, Dict[str, Union[str, bool, None]]]] = []
+    stuff: list[Union[str, dict[str, Union[str, bool, None]]]] = []
     rest = s
     while True:
         front, token, rest = peel_off_esc_code(rest)
@@ -73,7 +73,7 @@ def parse(s: str) -> List[Union[str, Dict[str, Union[str, bool, None]]]]:
     return stuff
 
 
-def peel_off_esc_code(s: str) -> Tuple[str, Optional[Token], str]:
+def peel_off_esc_code(s: str) -> tuple[str, Optional[Token], str]:
     r"""Returns processed text, the next token, and unprocessed text
 
     >>> front, d, rest = peel_off_esc_code('somestuff')
@@ -114,7 +114,7 @@ def peel_off_esc_code(s: str) -> Tuple[str, Optional[Token], str]:
         m = None
 
     if m:
-        d: Dict[str, Any] = m.groupdict()
+        d: dict[str, Any] = m.groupdict()
         del d["front"]
         del d["rest"]
         if "numbers" in d and all(d["numbers"].split(";")):
@@ -125,12 +125,12 @@ def peel_off_esc_code(s: str) -> Tuple[str, Optional[Token], str]:
         return s, None, ""
 
 
-def token_type(info: Token) -> Optional[List[Dict[str, Union[str, bool, None]]]]:
+def token_type(info: Token) -> Optional[list[dict[str, Union[str, bool, None]]]]:
     if info["command"] == "m":
         # The default action for ESC[m is to act like ESC[0m
         # Ref: https://en.wikipedia.org/wiki/ANSI_escape_code#CSI_codes
-        values = cast(List[int], info["numbers"]) if len(info["numbers"]) else [0]
-        tokens: List[Dict[str, Union[str, bool, None]]] = []
+        values = cast(list[int], info["numbers"]) if len(info["numbers"]) else [0]
+        tokens: list[dict[str, Union[str, bool, None]]] = []
         for value in values:
             if value in FG_NUMBER_TO_COLOR:
                 tokens.append({"fg": FG_NUMBER_TO_COLOR[value]})

curtsies/events.py

@@ -4,7 +4,8 @@
 import itertools
 import sys
 from enum import Enum, auto
-from typing import Optional, List, Sequence, Union
+from typing import Optional, List, Union
+from collections.abc import Sequence
 
 from .termhelpers import Termmode
 from .curtsieskeys import CURTSIES_NAMES as special_curtsies_names
@@ -144,7 +145,7 @@ class PasteEvent(Event):
     """
 
     def __init__(self) -> None:
-        self.events: List[str] = []
+        self.events: list[str] = []
 
     def __repr__(self) -> str:
         return "<Paste Event with data: %r>" % self.events

curtsies/formatstring.py

@@ -27,17 +27,14 @@
     Any,
     Callable,
     Dict,
-    Iterable,
-    Iterator,
     List,
-    Mapping,
-    MutableMapping,
     Optional,
     Tuple,
     Union,
     cast,
     no_type_check,
 )
+from collections.abc import Iterable, Iterator, Mapping, MutableMapping
 
 from .escseqparse import parse, remove_ansi
 from .termformatconstants import (
@@ -67,7 +64,7 @@
 }
 
 
-class FrozenAttributes(Dict[str, Union[int, bool]]):
+class FrozenAttributes(dict[str, Union[int, bool]]):
     """Immutable dictionary class for format string attributes"""
 
     def __setitem__(self, key: str, value: Union[int, bool]) -> None:
@@ -215,7 +212,7 @@ def reinit(self, chunk: Chunk) -> None:
             divides.append(divides[-1] + wcwidth(c))
         self.divides = divides
 
-    def request(self, max_width: int) -> Optional[Tuple[int, Chunk]]:
+    def request(self, max_width: int) -> Optional[tuple[int, Chunk]]:
         """Requests a sub-chunk of max_width or shorter. Returns None if no chunks left."""
         if max_width < 1:
             raise ValueError("requires positive integer max_width")
@@ -413,8 +410,8 @@ def copy_with_new_atts(self, **attributes: Union[bool, int]) -> "FmtStr":
 
     def join(self, iterable: Iterable[Union[str, "FmtStr"]]) -> "FmtStr":
         """Joins an iterable yielding strings or FmtStrs with self as separator"""
-        before: List[Chunk] = []
-        chunks: List[Chunk] = []
+        before: list[Chunk] = []
+        chunks: list[Chunk] = []
         for s in iterable:
             chunks.extend(before)
             before = self.chunks
@@ -432,7 +429,7 @@ def split(
         sep: Optional[str] = None,
         maxsplit: Optional[int] = None,
         regex: bool = False,
-    ) -> List["FmtStr"]:
+    ) -> list["FmtStr"]:
         """Split based on separator, optionally using a regex.
 
         Capture groups are ignored in regex, the whole pattern is matched
@@ -453,7 +450,7 @@ def split(
             )
         ]
 
-    def splitlines(self, keepends: bool = False) -> List["FmtStr"]:
+    def splitlines(self, keepends: bool = False) -> list["FmtStr"]:
         """Return a list of lines, split on newline characters,
         include line boundaries, if keepends is true."""
         lines = self.split("\n")
@@ -560,7 +557,7 @@ def __mul__(self, other: int) -> "FmtStr":
     # TODO ensure empty FmtStr isn't a problem
 
     @property
-    def shared_atts(self) -> Dict[str, Union[int, bool]]:
+    def shared_atts(self) -> dict[str, Union[int, bool]]:
         """Gets atts shared among all nonzero length component Chunks"""
         # TODO cache this, could get ugly for large FmtStrs
         atts = {}
@@ -582,7 +579,7 @@ def new_with_atts_removed(self, *attributes: str) -> "FmtStr":
         return result
 
     @no_type_check
-    def __getattr__(self, att):
+    def __getattr__(self, att: str):
         # thanks to @aerenchyma/@jczett
         if not hasattr(self.s, att):
             raise AttributeError(f"No attribute {att!r}")
@@ -600,7 +597,7 @@ def func_help(*args, **kwargs):
         return func_help
 
     @property
-    def divides(self) -> List[int]:
+    def divides(self) -> list[int]:
         """List of indices of divisions between the constituent chunks."""
         acc = [0]
         for s in self.chunks:
@@ -752,7 +749,7 @@ def width_aware_slice(s: str, start: int, end: int, replacement_char: str = " ")
     return "".join(new_chunk_chars)
 
 
-def linesplit(string: Union[str, FmtStr], columns: int) -> List[FmtStr]:
+def linesplit(string: Union[str, FmtStr], columns: int) -> list[FmtStr]:
     """Returns a list of lines, split on the last possible space of each line.
 
     Split spaces will be removed. Whitespaces will be normalized to one space.
@@ -820,9 +817,9 @@ def normalize_slice(length: int, index: Union[int, slice]) -> slice:
 
 
 def parse_args(
-    args: Tuple[str, ...],
+    args: tuple[str, ...],
     kwargs: MutableMapping[str, Union[int, bool, str]],
-) -> Mapping[str, Union[int, bool]]:
+) -> MutableMapping[str, Union[int, bool]]:
     """Returns a kwargs dictionary by turning args into kwargs"""
     if "style" in kwargs:
         args += (cast(str, kwargs["style"]),)

curtsies/formatstringarray.py

@@ -34,12 +34,12 @@
     Optional,
     Union,
     List,
-    Sequence,
     overload,
     Tuple,
     cast,
     no_type_check,
 )
+from collections.abc import Sequence
 
 logger = logging.getLogger(__name__)
 
@@ -60,26 +60,26 @@ def __init__(
         self, num_rows: int, num_columns: int, *args: Any, **kwargs: Any
     ) -> None:
         self.saved_args, self.saved_kwargs = args, kwargs
-        self.rows: List[FmtStr] = [fmtstr("", *args, **kwargs) for _ in range(num_rows)]
+        self.rows: list[FmtStr] = [fmtstr("", *args, **kwargs) for _ in range(num_rows)]
         self.num_columns = num_columns
 
     @overload
     def __getitem__(self, slicetuple: int) -> FmtStr:
         pass
 
     @overload
-    def __getitem__(self, slicetuple: slice) -> List[FmtStr]:
+    def __getitem__(self, slicetuple: slice) -> list[FmtStr]:
         pass
 
     @overload
     def __getitem__(
-        self, slicetuple: Tuple[Union[slice, int], Union[slice, int]]
-    ) -> List[FmtStr]:
+        self, slicetuple: tuple[Union[slice, int], Union[slice, int]]
+    ) -> list[FmtStr]:
         pass
 
     def __getitem__(
-        self, slicetuple: Union[int, slice, Tuple[Union[int, slice], Union[int, slice]]]
-    ) -> Union[FmtStr, List[FmtStr]]:
+        self, slicetuple: Union[int, slice, tuple[Union[int, slice], Union[int, slice]]]
+    ) -> Union[FmtStr, list[FmtStr]]:
         if isinstance(slicetuple, int):
             if slicetuple < 0:
                 slicetuple = len(self.rows) - slicetuple
@@ -99,7 +99,7 @@ def __len__(self) -> int:
         return len(self.rows)
 
     @property
-    def shape(self) -> Tuple[int, int]:
+    def shape(self) -> tuple[int, int]:
         """Tuple of (len(rows, len(num_columns)) numpy-style shape"""
         return len(self.rows), self.num_columns
 
@@ -301,7 +301,7 @@ def assertFSArraysEqual(a: FSArray, b: FSArray) -> None:
 
 def assertFSArraysEqualIgnoringFormatting(a: FSArray, b: FSArray) -> None:
     """Also accepts arrays of strings"""
-    assert len(a) == len(b), "fsarray heights do not match: %s %s \n%s \n%s" % (
+    assert len(a) == len(b), "fsarray heights do not match: {} {} \n{} \n{}".format(
         len(a),
         len(b),
         simple_format(a),
@@ -310,7 +310,7 @@ def assertFSArraysEqualIgnoringFormatting(a: FSArray, b: FSArray) -> None:
     for i, (a_row, b_row) in enumerate(zip(a, b)):
         a_row = a_row.s if isinstance(a_row, FmtStr) else a_row
         b_row = b_row.s if isinstance(b_row, FmtStr) else b_row
-        assert a_row == b_row, "FSArrays differ first on line %s:\n%s" % (
+        assert a_row == b_row, "FSArrays differ first on line {}:\n{}".format(
             i,
             FSArray.diff(a, b, ignore_formatting=True),
         )
@@ -319,7 +319,7 @@ def assertFSArraysEqualIgnoringFormatting(a: FSArray, b: FSArray) -> None:
 if __name__ == "__main__":
     a = FSArray(3, 14, bg="blue")
     a[0:2, 5:11] = cast(
-        Tuple[FmtStr, ...],
+        tuple[FmtStr, ...],
         (fmtstr("hey", "on_blue") + " " + fmtstr("yo", "on_red"), fmtstr("qwe qw")),
     )
     a.dumb_display()