Bumped the minimum Python version to 3.10

Python <=3.9 are EOL.

Author: superbobry

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "pypy-3.10"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "pypy-3.10"]
 
     steps:
       - uses: "actions/checkout@v2"

README

@@ -9,7 +9,7 @@
         | |_) || |_| || |_|  __/
         | .__/  \__, | \__|\___|
         | |      __/ |
-        |_|     |___/      0.8.2
+        |_|     |___/      0.8.3dev
 
 
 What is ``pyte``?

benchmark.py

@@ -29,7 +29,7 @@
 
 
 def make_benchmark(path, screen_cls):
-    with io.open(path, "rt", encoding="utf-8") as handle:
+    with open(path, encoding="utf-8") as handle:
         data = handle.read()
 
     stream = pyte.Stream(screen_cls(80, 24))

docs/conf.py

@@ -42,17 +42,17 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'pyte'
-copyright = u'2011-2012 Selectel, 2012-2017 pyte authors and contributors'
+project = 'pyte'
+copyright = '2011-2012 Selectel, 2012-2025 pyte authors and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.8.2'
+version = '0.8.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.8.2'
+release = '0.8.3dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

examples/helloworld.py

@@ -17,4 +17,4 @@
     stream.feed("Hello World!")
 
     for idx, line in enumerate(screen.display, 1):
-        print("{0:2d} {1} ¶".format(idx, line))
+        print(f"{idx:2d} {line} ¶")

examples/history.py

@@ -21,7 +21,7 @@ def print_screen(screen, text):
     print(pyte.control.ESC + pyte.escape.RIS)
 
     for idx, line in enumerate(screen.display, 1):
-        print("{0:2d} {1} ¶".format(idx, line))
+        print(f"{idx:2d} {line} ¶")
 
     input(os.linesep + os.linesep + text)
 

examples/terminal_emulator.py

@@ -33,8 +33,7 @@ def __init__(self, lines):
         self.lines = lines
 
     def __rich_console__(self, console, options):
-        for line in self.lines:
-            yield line
+        yield from self.lines
 
 
 class Terminal(Widget, can_focus=True):

pyte/__init__.py

@@ -33,7 +33,7 @@
 
 
 if __debug__:
-    def dis(chars: Union[bytes, str]) -> None:
+    def dis(chars: bytes | str) -> None:
         """A :func:`dis.dis` for terminals.
 
         >>> dis(b"\x07")       # doctest: +NORMALIZE_WHITESPACE

pyte/graphics.py

@@ -143,4 +143,4 @@
     v = 8 + i * 10
     _FG_BG_256.append((v, v, v))
 
-FG_BG_256 = ["{0:02x}{1:02x}{2:02x}".format(r, g, b) for r, g, b in _FG_BG_256]
+FG_BG_256 = [f"{r:02x}{g:02x}{b:02x}" for r, g, b in _FG_BG_256]

pyte/screens.py

@@ -35,7 +35,8 @@
 import warnings
 from collections import deque, defaultdict
 from functools import lru_cache
-from typing import Any, Callable, Dict, Generator, List, NamedTuple, Optional, Set, Sequence, TextIO, TypeVar
+from typing import Any, Dict, List, NamedTuple, Optional, Set, TextIO, TypeVar
+from collections.abc import Callable, Generator, Sequence
 
 from wcwidth import wcwidth as _wcwidth  # type: ignore[import-untyped]
 
@@ -115,7 +116,7 @@ def __init__(self, x: int, y: int, attrs: Char = Char(" ")) -> None:
         self.hidden = False
 
 
-class StaticDefaultDict(Dict[KT, VT]):
+class StaticDefaultDict(dict[KT, VT]):
     """A :func:`dict` with a static default value.
 
     Unlike :func:`collections.defaultdict` this implementation does not
@@ -134,7 +135,7 @@ def __missing__(self, key: KT) -> VT:
         return self.default
 
 
-_DEFAULT_MODE = set([mo.DECAWM, mo.DECTCEM])
+_DEFAULT_MODE = {mo.DECAWM, mo.DECTCEM}
 
 
 class Screen:
@@ -214,23 +215,23 @@ def default_char(self) -> Char:
         return Char(data=" ", fg="default", bg="default", reverse=reverse)
 
     def __init__(self, columns: int, lines: int) -> None:
-        self.savepoints: List[Savepoint] = []
+        self.savepoints: list[Savepoint] = []
         self.columns = columns
         self.lines = lines
-        self.buffer: Dict[int, StaticDefaultDict[int, Char]] = defaultdict(lambda: StaticDefaultDict[int, Char](self.default_char))
-        self.dirty: Set[int] = set()
+        self.buffer: dict[int, StaticDefaultDict[int, Char]] = defaultdict(lambda: StaticDefaultDict[int, Char](self.default_char))
+        self.dirty: set[int] = set()
         self.reset()
         self.mode = _DEFAULT_MODE.copy()
-        self.margins: Optional[Margins] = None
+        self.margins: Margins | None = None
 
     def __repr__(self) -> str:
-        return ("{0}({1}, {2})".format(self.__class__.__name__,
+        return ("{}({}, {})".format(self.__class__.__name__,
                                        self.columns, self.lines))
 
     @property
-    def display(self) -> List[str]:
+    def display(self) -> list[str]:
         """A :func:`list` of screen lines as unicode strings."""
-        def render(line: StaticDefaultDict[int, Char]) -> Generator[str, None, None]:
+        def render(line: StaticDefaultDict[int, Char]) -> Generator[str]:
             is_wide_char = False
             for x in range(self.columns):
                 if is_wide_char:  # Skip stub
@@ -281,9 +282,9 @@ def reset(self) -> None:
         self.cursor = Cursor(0, 0)
         self.cursor_position()
 
-        self.saved_columns: Optional[int] = None
+        self.saved_columns: int | None = None
 
-    def resize(self, lines: Optional[int] = None, columns: Optional[int] = None) -> None:
+    def resize(self, lines: int | None = None, columns: int | None = None) -> None:
         """Resize the screen to the given size.
 
         If the requested screen size has more lines than the existing
@@ -324,7 +325,7 @@ def resize(self, lines: Optional[int] = None, columns: Optional[int] = None) ->
         self.lines, self.columns = lines, columns
         self.set_margins()
 
-    def set_margins(self, top: Optional[int] = None, bottom: Optional[int] = None) -> None:
+    def set_margins(self, top: int | None = None, bottom: int | None = None) -> None:
         """Select top and bottom margins for the scrolling region.
 
         :param int top: the smallest line number that is scrolled.
@@ -638,7 +639,7 @@ def restore_cursor(self) -> None:
             self.reset_mode(mo.DECOM)
             self.cursor_position()
 
-    def insert_lines(self, count: Optional[int] = None) -> None:
+    def insert_lines(self, count: int | None = None) -> None:
         """Insert the indicated # of lines at line with cursor. Lines
         displayed **at** and below the cursor move down. Lines moved
         past the bottom margin are lost.
@@ -658,7 +659,7 @@ def insert_lines(self, count: Optional[int] = None) -> None:
 
             self.carriage_return()
 
-    def delete_lines(self, count: Optional[int] = None) -> None:
+    def delete_lines(self, count: int | None = None) -> None:
         """Delete the indicated # of lines, starting at line with
         cursor. As lines are deleted, lines displayed below cursor
         move up. Lines added to bottom of screen have spaces with same
@@ -681,7 +682,7 @@ def delete_lines(self, count: Optional[int] = None) -> None:
 
             self.carriage_return()
 
-    def insert_characters(self, count: Optional[int] = None) -> None:
+    def insert_characters(self, count: int | None = None) -> None:
         """Insert the indicated # of blank characters at the cursor
         position. The cursor does not move and remains at the beginning
         of the inserted blank characters. Data on the line is shifted
@@ -698,7 +699,7 @@ def insert_characters(self, count: Optional[int] = None) -> None:
                 line[x + count] = line[x]
             line.pop(x, None)
 
-    def delete_characters(self, count: Optional[int] = None) -> None:
+    def delete_characters(self, count: int | None = None) -> None:
         """Delete the indicated # of characters, starting with the
         character at cursor position. When a character is deleted, all
         characters to the right of cursor move left. Character attributes
@@ -716,7 +717,7 @@ def delete_characters(self, count: Optional[int] = None) -> None:
             else:
                 line.pop(x, None)
 
-    def erase_characters(self, count: Optional[int] = None) -> None:
+    def erase_characters(self, count: int | None = None) -> None:
         """Erase the indicated # of characters, starting with the
         character at cursor position. Character attributes are set
         cursor attributes. The cursor remains in the same position.
@@ -828,7 +829,7 @@ def ensure_hbounds(self) -> None:
         """Ensure the cursor is within horizontal screen bounds."""
         self.cursor.x = min(max(0, self.cursor.x), self.columns - 1)
 
-    def ensure_vbounds(self, use_margins: Optional[bool] = None) -> None:
+    def ensure_vbounds(self, use_margins: bool | None = None) -> None:
         """Ensure the cursor is within vertical screen bounds.
 
         :param bool use_margins: when ``True`` or when
@@ -843,7 +844,7 @@ def ensure_vbounds(self, use_margins: Optional[bool] = None) -> None:
 
         self.cursor.y = min(max(top, self.cursor.y), bottom)
 
-    def cursor_up(self, count: Optional[int] = None) -> None:
+    def cursor_up(self, count: int | None = None) -> None:
         """Move cursor up the indicated # of lines in same column.
         Cursor stops at top margin.
 
@@ -852,7 +853,7 @@ def cursor_up(self, count: Optional[int] = None) -> None:
         top, _bottom = self.margins or Margins(0, self.lines - 1)
         self.cursor.y = max(self.cursor.y - (count or 1), top)
 
-    def cursor_up1(self, count: Optional[int] = None) -> None:
+    def cursor_up1(self, count: int | None = None) -> None:
         """Move cursor up the indicated # of lines to column 1. Cursor
         stops at bottom margin.
 
@@ -861,7 +862,7 @@ def cursor_up1(self, count: Optional[int] = None) -> None:
         self.cursor_up(count)
         self.carriage_return()
 
-    def cursor_down(self, count: Optional[int] = None) -> None:
+    def cursor_down(self, count: int | None = None) -> None:
         """Move cursor down the indicated # of lines in same column.
         Cursor stops at bottom margin.
 
@@ -870,7 +871,7 @@ def cursor_down(self, count: Optional[int] = None) -> None:
         _top, bottom = self.margins or Margins(0, self.lines - 1)
         self.cursor.y = min(self.cursor.y + (count or 1), bottom)
 
-    def cursor_down1(self, count: Optional[int] = None) -> None:
+    def cursor_down1(self, count: int | None = None) -> None:
         """Move cursor down the indicated # of lines to column 1.
         Cursor stops at bottom margin.
 
@@ -879,7 +880,7 @@ def cursor_down1(self, count: Optional[int] = None) -> None:
         self.cursor_down(count)
         self.carriage_return()
 
-    def cursor_back(self, count: Optional[int] = None) -> None:
+    def cursor_back(self, count: int | None = None) -> None:
         """Move cursor left the indicated # of columns. Cursor stops
         at left margin.
 
@@ -893,7 +894,7 @@ def cursor_back(self, count: Optional[int] = None) -> None:
         self.cursor.x -= count or 1
         self.ensure_hbounds()
 
-    def cursor_forward(self, count: Optional[int] = None) -> None:
+    def cursor_forward(self, count: int | None = None) -> None:
         """Move cursor right the indicated # of columns. Cursor stops
         at right margin.
 
@@ -902,7 +903,7 @@ def cursor_forward(self, count: Optional[int] = None) -> None:
         self.cursor.x += count or 1
         self.ensure_hbounds()
 
-    def cursor_position(self, line: Optional[int] = None, column: Optional[int] = None) -> None:
+    def cursor_position(self, line: int | None = None, column: int | None = None) -> None:
         """Set the cursor to a specific `line` and `column`.
 
         Cursor is allowed to move out of the scrolling region only when
@@ -929,15 +930,15 @@ def cursor_position(self, line: Optional[int] = None, column: Optional[int] = No
         self.ensure_hbounds()
         self.ensure_vbounds()
 
-    def cursor_to_column(self, column: Optional[int] = None) -> None:
+    def cursor_to_column(self, column: int | None = None) -> None:
         """Move cursor to a specific column in the current line.
 
         :param int column: column number to move the cursor to.
         """
         self.cursor.x = (column or 1) - 1
         self.ensure_hbounds()
 
-    def cursor_to_line(self, line: Optional[int] = None) -> None:
+    def cursor_to_line(self, line: int | None = None) -> None:
         """Move cursor to a specific line in the current column.
 
         :param int line: line number to move the cursor to.
@@ -1008,7 +1009,7 @@ def select_graphic_rendition(self, *attrs: int) -> None:
                         # This is somewhat non-standard but is nonetheless
                         # supported in quite a few terminals. See discussion
                         # here https://gist.github.com/XVilka/8346728.
-                        replace[key] = "{0:02x}{1:02x}{2:02x}".format(
+                        replace[key] = "{:02x}{:02x}{:02x}".format(
                             attrs_list.pop(), attrs_list.pop(), attrs_list.pop())
                 except IndexError:
                     pass
@@ -1048,7 +1049,7 @@ def report_device_status(self, mode: int) -> None:
             if mo.DECOM in self.mode:
                 assert self.margins is not None
                 y -= self.margins.top
-            self.write_process_input(ctrl.CSI + "{0};{1}R".format(y, x))
+            self.write_process_input(ctrl.CSI + f"{y};{x}R")
 
     def write_process_input(self, data: str) -> None:
         """Write data to the process running inside the terminal.
@@ -1085,7 +1086,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
             "``Screen`` and will be removed in 0.8.0. Please update "
             "your code accordingly.", DeprecationWarning)
 
-        super(DiffScreen, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
 
 class History(NamedTuple):
@@ -1145,7 +1146,7 @@ def __init__(self, columns: int, lines: int, history: int = 100, ratio: float =
                                history,
                                history)
 
-        super(HistoryScreen, self).__init__(columns, lines)
+        super().__init__(columns, lines)
 
     def _make_wrapper(self, event: str, handler: Callable[..., Any]) -> Callable[..., Any]:
         def inner(*args: Any, **kwargs: Any) -> Any:
@@ -1156,7 +1157,7 @@ def inner(*args: Any, **kwargs: Any) -> Any:
         return inner
 
     def __getattribute__(self, attr: str) -> Callable[..., Any]:
-        value = super(HistoryScreen, self).__getattribute__(attr)
+        value = super().__getattribute__(attr)
         if attr in HistoryScreen._wrapped:
             return HistoryScreen._make_wrapper(self, attr, value)
         else:
@@ -1202,12 +1203,12 @@ def reset(self) -> None:
         is reset to bottom of both queues;  queues themselves are
         emptied.
         """
-        super(HistoryScreen, self).reset()
+        super().reset()
         self._reset_history()
 
     def erase_in_display(self, how: int = 0, *args: Any, **kwargs: Any) -> None:
         """Overloaded to reset history state."""
-        super(HistoryScreen, self).erase_in_display(how, *args, **kwargs)
+        super().erase_in_display(how, *args, **kwargs)
 
         if how == 3:
             self._reset_history()
@@ -1219,7 +1220,7 @@ def index(self) -> None:
         if self.cursor.y == bottom:
             self.history.top.append(self.buffer[top])
 
-        super(HistoryScreen, self).index()
+        super().index()
 
     def reverse_index(self) -> None:
         """Overloaded to update bottom history with the removed lines."""
@@ -1228,7 +1229,7 @@ def reverse_index(self) -> None:
         if self.cursor.y == top:
             self.history.bottom.append(self.buffer[bottom])
 
-        super(HistoryScreen, self).reverse_index()
+        super().reverse_index()
 
     def prev_page(self) -> None:
         """Move the screen page up through the history buffer. Page
@@ -1332,7 +1333,7 @@ def wrapper(*args: Any, **kwargs: Any) -> None:
 
     def __getattribute__(self, attr: str) -> Callable[..., None]:
         if attr not in Stream.events:
-            return super(DebugScreen, self).__getattribute__(attr)  # type: ignore[no-any-return]
+            return super().__getattribute__(attr)  # type: ignore[no-any-return]
         elif not self.only or attr in self.only:
             return self.only_wrapper(attr)
         else: