urwid 2.6.15__py3-none-any.whl → 3.0.0__py3-none-any.whl

urwid/display/escape.py

@@ -32,7 +32,7 @@ from collections.abc import MutableMapping, Sequence
 from urwid import str_util
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Collection, Iterable
+    from collections.abc import Iterable
 
 # NOTE: because of circular imports (urwid.util -> urwid.escape -> urwid.util)
 # from urwid.util import is_mouse_event -- will not work here
@@ -85,6 +85,8 @@ input_sequences = [
     ("[F", "end"),
     ("[G", "5"),
     ("[H", "home"),
+    ("[I", "focus in"),
+    ("[O", "focus out"),
     ("[1~", "home"),
     ("[2~", "insert"),
     ("[3~", "delete"),
@@ -214,10 +216,10 @@ class KeyqueueTrie:
         root[ord(s)] = result
 
     def get(self, keys, more_available: bool):
-        result = self.get_recurse(self.data, keys, more_available)
-        if not result:
-            result = self.read_cursor_position(keys, more_available)
-        return result
+        if result := self.get_recurse(self.data, keys, more_available):
+            return result
+
+        return self.read_cursor_position(keys, more_available)
 
     def get_recurse(
         self,
@@ -225,7 +227,7 @@ class KeyqueueTrie:
             MutableMapping[int, str | MutableMapping[int, str | MutableMapping[int, str]]]
             | typing.Literal["mouse", "sgrmouse"]
         ),
-        keys: Collection[int],
+        keys: Sequence[int],
         more_available: bool,
     ):
         if not isinstance(root, MutableMapping):
@@ -245,7 +247,7 @@ class KeyqueueTrie:
             return None
         return self.get_recurse(root[keys[0]], keys[1:], more_available)
 
-    def read_mouse_info(self, keys: Collection[int], more_available: bool):
+    def read_mouse_info(self, keys: Sequence[int], more_available: bool):
         if len(keys) < 3:
             if more_available:
                 raise MoreInputRequired()
@@ -284,7 +286,7 @@ class KeyqueueTrie:
 
         return ((f"{prefix}mouse {action}", button, x, y), keys[3:])
 
-    def read_sgrmouse_info(self, keys: Collection[int], more_available: bool):
+    def read_sgrmouse_info(self, keys: Sequence[int], more_available: bool):
         # Helpful links:
         # https://stackoverflow.com/questions/5966903/how-to-get-mousemove-and-mouseclick-in-bash
         # http://invisible-island.net/xterm/ctlseqs/ctlseqs.pdf
@@ -538,9 +540,7 @@ def process_keyqueue(codes: Sequence[int], more_available: bool) -> tuple[list[s
     if code != 27:
         return [f"<{code:d}>"], codes[1:]
 
-    result = input_trie.get(codes[1:], more_available)
-
-    if result is not None:
+    if (result := input_trie.get(codes[1:], more_available)) is not None:
         result, remaining_codes = result
         return [result], remaining_codes
 
@@ -551,7 +551,7 @@ def process_keyqueue(codes: Sequence[int], more_available: bool) -> tuple[list[s
             return ["esc", *run], remaining_codes
         if run[0] == "esc" or run[0].find("meta ") >= 0:
             return ["esc", *run], remaining_codes
-        return [f"meta {run[0]}"] + run[1:], remaining_codes
+        return [f"meta {run[0]}", *run[1:]], remaining_codes
 
     return ["esc"], codes[1:]
 
@@ -574,6 +574,9 @@ RESTORE_NORMAL_BUFFER = f"{ESC}[?1049l"
 ENABLE_BRACKETED_PASTE_MODE = f"{ESC}[?2004h"
 DISABLE_BRACKETED_PASTE_MODE = f"{ESC}[?2004l"
 
+ENABLE_FOCUS_REPORTING = f"{ESC}[?1004h"
+DISABLE_FOCUS_REPORTING = f"{ESC}[?1004l"
+
 # RESET_SCROLL_REGION = ESC+"[;r"
 # RESET = ESC+"c"
 

urwid/display/lcd.py

@@ -218,10 +218,9 @@ class CFLCDScreen(LCDScreen, abc.ABC):
             raise cls.MoreDataRequired
 
         data_end = 2 + packet_len
-        crc = cls.get_crc(data[:data_end])
-        pcrc = data[data_end : data_end + 2]
-        if crc != pcrc:
-            raise cls.InvalidPacket("CRC doesn't match")
+        if (crc := cls.get_crc(data[:data_end])) != (packet_crc := data[data_end : data_end + 2]):
+            raise cls.InvalidPacket(f"CRC doesn't match ({crc=}, {packet_crc=})")
+
         return command, data[2:data_end], data[data_end + 2 :]
 
 
@@ -401,8 +400,7 @@ class CF635Screen(CFLCDScreen):
 
             packet = self._read_packet()
 
-        next_repeat = self.key_repeat.next_event()
-        if next_repeat:
+        if next_repeat := self.key_repeat.next_event():
             timeout, key = next_repeat
             if not timeout:
                 data_input.append(key)

urwid/display/web.py

@@ -21,6 +21,7 @@
 """
 Urwid web application display module
 """
+
 from __future__ import annotations
 
 import dataclasses
@@ -216,7 +217,7 @@ class Screen(BaseScreen):
             sys.stdout.write("Status: 503 Sever Busy\r\n\r\n")
             sys.exit(0)
 
-        urwid_id = f"{random.randrange(10 ** 9):09d}{random.randrange(10 ** 9):09d}"  # noqa: S311
+        urwid_id = f"{random.randrange(10**9):09d}{random.randrange(10**9):09d}"  # noqa: S311
         self.pipe_name = os.path.join(_prefs.pipe_dir, f"urwid{urwid_id}")
         os.mkfifo(f"{self.pipe_name}.in", 0o600)
         signal.signal(signal.SIGTERM, self._cleanup_pipe)
@@ -224,11 +225,7 @@ class Screen(BaseScreen):
         self.input_fd = os.open(f"{self.pipe_name}.in", os.O_NONBLOCK | os.O_RDONLY)
         self.input_tail = ""
         self.content_head = (
-            "Content-type: "
-            "multipart/x-mixed-replace;boundary=ZZ\r\n"
-            "X-Urwid-ID: " + urwid_id + "\r\n"
-            "\r\n\r\n"
-            "--ZZ\r\n"
+            f"Content-type: multipart/x-mixed-replace;boundary=ZZ\r\nX-Urwid-ID: {urwid_id}\r\n\r\n\r\n--ZZ\r\n"
         )
         if self.update_method == "polling":
             self.content_head = f"Content-type: text/plain\r\nX-Urwid-ID: {urwid_id}\r\n\r\n\r\n"
@@ -328,8 +325,8 @@ class Screen(BaseScreen):
             if y == cy:
                 sig = (*sig, cx)
             new_screen[sig] = [*new_screen.get(sig, []), y]
-            old_line_numbers = self.last_screen.get(sig, None)
-            if old_line_numbers is not None:
+
+            if (old_line_numbers := self.last_screen.get(sig, None)) is not None:
                 if y in old_line_numbers:
                     old_line = y
                 else:
@@ -609,16 +606,14 @@ def daemonize(errfile: str) -> None:
     """
     Detach process and become a daemon.
     """
-    pid = os.fork()
-    if pid:
+    if os.fork():
         os._exit(0)
 
     os.setsid()
     signal.signal(signal.SIGHUP, signal.SIG_IGN)
     os.umask(0)
 
-    pid = os.fork()
-    if pid:
+    if os.fork():
         os._exit(0)
 
     os.chdir("/")

urwid/event_loop/asyncio_loop.py

@@ -205,8 +205,7 @@ class AsyncioEventLoop(EventLoop):
         return True
 
     def _exception_handler(self, loop: asyncio.AbstractEventLoop, context):
-        exc = context.get("exception")
-        if exc:
+        if exc := context.get("exception"):
             loop.stop()
 
             if self._idle_asyncio_handle:

urwid/event_loop/main_loop.py

@@ -172,7 +172,8 @@ class MainLoop:
     def _set_widget(self, widget: Widget) -> None:
         warnings.warn(
             f"method `{self.__class__.__name__}._set_widget` is deprecated, "
-            f"please use `{self.__class__.__name__}.widget` property",
+            f"please use `{self.__class__.__name__}.widget` property."
+            "API will be removed in version 4.0.",
             DeprecationWarning,
             stacklevel=2,
         )
@@ -193,7 +194,8 @@ class MainLoop:
     def _set_pop_ups(self, pop_ups: bool) -> None:
         warnings.warn(
             f"method `{self.__class__.__name__}._set_pop_ups` is deprecated, "
-            f"please use `{self.__class__.__name__}.pop_ups` property",
+            f"please use `{self.__class__.__name__}.pop_ups` property."
+            "API will be removed in version 4.0.",
             DeprecationWarning,
             stacklevel=2,
         )
@@ -460,9 +462,7 @@ class MainLoop:
         widget.mouse_event((15, 5), 'mouse press', 1, 5, 4, focus=True)
         >>> ml._update([], [])
         """
-        keys = self.input_filter(keys, raw)
-
-        if keys:
+        if keys := self.input_filter(keys, raw):
             self.process_input(keys)
             if "window resize" in keys:
                 self.screen_size = None
@@ -493,19 +493,14 @@ class MainLoop:
                 else:
                     self.screen.set_input_timeouts(None)
                 keys, raw = self.screen.get_input(True)
-                if not keys and next_alarm:
-                    sec = next_alarm[0] - time.time()
-                    if sec <= 0:
-                        break
-
-            keys = self.input_filter(keys, raw)
+                if not keys and next_alarm and next_alarm[0] - time.time() <= 0:
+                    break
 
-            if keys:
+            if keys := self.input_filter(keys, raw):
                 self.process_input(keys)
 
             while next_alarm:
-                sec = next_alarm[0] - time.time()
-                if sec > 0:
+                if (next_alarm[0] - time.time()) > 0:
                     break
                 _tm, _tie_break, callback = next_alarm
                 callback()
@@ -563,13 +558,13 @@ class MainLoop:
 
             if isinstance(key, str):
                 if self._topmost_widget.selectable():
-                    handled_key = self._topmost_widget.keypress(self.screen_size, key)
-                    if not handled_key:
+                    if handled_key := self._topmost_widget.keypress(self.screen_size, key):
+                        key = handled_key  # noqa: PLW2901
+
+                    else:
                         something_handled = True
                         continue
 
-                    key = handled_key  # noqa: PLW2901
-
             elif is_mouse_event(key):
                 event, button, col, row = key
                 if hasattr(self._topmost_widget, "mouse_event") and self._topmost_widget.mouse_event(

urwid/event_loop/tornado_loop.py

@@ -155,12 +155,11 @@ class TornadoEventLoop(EventLoop):
         return handle
 
     def remove_watch_file(self, handle: int) -> bool:
-        fd = self._watch_handles.pop(handle, None)
-        if fd is None:
-            return False
+        if (fd := self._watch_handles.pop(handle, None)) is not None:
+            self._loop.remove_handler(fd)
+            return True
 
-        self._loop.remove_handler(fd)
-        return True
+        return False
 
     def enter_idle(self, callback: Callable[[], typing.Any]) -> int:
         """

urwid/event_loop/trio_loop.py

@@ -261,7 +261,7 @@ class TrioEventLoop(EventLoop):
         """
         for task, scope, args in self._pending_tasks:
             self._nursery.start_soon(task, scope, *args)
-        del self._pending_tasks[:]
+        self._pending_tasks.clear()
 
     def _start_task(
         self,

urwid/font.py

@@ -29,7 +29,7 @@ from urwid.display.escape import SAFE_ASCII_DEC_SPECIAL_RE
 from urwid.util import apply_target_encoding, str_util
 
 if typing.TYPE_CHECKING:
-    from collections.abc import Iterable, Iterator, Sequence
+    from collections.abc import Iterator, Sequence
 
     from typing_extensions import Literal
 
@@ -192,9 +192,9 @@ class Font(metaclass=FontRegistry):
 
     __slots__ = ("canvas", "char", "utf8_required")
 
-    height: int
-    data: Sequence[str]
-    name: str
+    height: int  # pylint: disable=declare-non-slot
+    data: Sequence[str]  # pylint: disable=declare-non-slot
+    name: str  # pylint: disable=declare-non-slot
 
     def __init__(self) -> None:
         if not self.height:
@@ -206,12 +206,10 @@ class Font(metaclass=FontRegistry):
         self.canvas: dict[str, TextCanvas] = {}
         self.utf8_required = False
         if isinstance(self.data, str):
-            self.add_glyphs(self._to_text(self.data))
+            self.add_glyphs(self.data)
 
         else:
-            data: Iterable[str] = (self._to_text(block) for block in self.data)
-
-            for gdata in data:
+            for gdata in self.data:
                 self.add_glyphs(gdata)
 
     def __repr__(self) -> str:
@@ -223,22 +221,19 @@ class Font(metaclass=FontRegistry):
 
     @staticmethod
     def _to_text(
-        obj: str | bytes,
+        obj: str,
         encoding: str = "utf-8",
         errors: Literal["strict", "ignore", "replace"] = "strict",
     ) -> str:
+        warnings.warn(
+            "_to_text is deprecated: only text fonts are supported. API will be removed in version 4.0.",
+            DeprecationWarning,
+            stacklevel=3,
+        )
         if isinstance(obj, str):
             return obj
 
-        if isinstance(obj, bytes):
-            warnings.warn(
-                "Bytes based fonts are deprecated, please switch to the text one",
-                DeprecationWarning,
-                stacklevel=3,
-            )
-            return obj.decode(encoding, errors)
-
-        raise TypeError(f"{obj!r} is not str|bytes")
+        raise TypeError(f"{obj!r} is not str")
 
     def add_glyphs(self, gdata: str) -> None:
         d, utf8_required = separate_glyphs(gdata, self.height)

urwid/signals.py

@@ -20,6 +20,7 @@
 
 from __future__ import annotations
 
+import abc
 import itertools
 import typing
 import warnings
@@ -29,7 +30,7 @@ if typing.TYPE_CHECKING:
     from collections.abc import Callable, Collection, Container, Hashable, Iterable
 
 
-class MetaSignals(type):
+class MetaSignals(abc.ABCMeta):
     """
     register the list of signals in the class variable signals,
     including signals in superclasses.

urwid/str_util.py

@@ -29,17 +29,17 @@ import wcwidth
 if typing.TYPE_CHECKING:
     from typing_extensions import Literal
 
-SAFE_ASCII_RE = re.compile("^[ -~]*$")
-SAFE_ASCII_BYTES_RE = re.compile(b"^[ -~]*$")
+SAFE_ASCII_RE = re.compile(r"^[ -~]*$")
+SAFE_ASCII_BYTES_RE = re.compile(rb"^[ -~]*$")
 
 _byte_encoding: Literal["utf8", "narrow", "wide"] = "narrow"
 
 
 def get_char_width(char: str) -> Literal[0, 1, 2]:
-    width = wcwidth.wcwidth(char)
-    if width < 0:
-        return 0
-    return width
+    if (width := wcwidth.wcwidth(char)) >= 0:
+        return width
+
+    return 0
 
 
 def get_width(o: int) -> Literal[0, 1, 2]:
@@ -86,10 +86,9 @@ def decode_one(text: bytes | str, pos: int) -> tuple[int, int]:
     if b1 & 0xE0 == 0xC0:
         if b2 & 0xC0 != 0x80:
             return error
-        o = ((b1 & 0x1F) << 6) | (b2 & 0x3F)
-        if o < 0x80:
-            return error
-        return o, pos + 2
+        if (o := ((b1 & 0x1F) << 6) | (b2 & 0x3F)) >= 0x80:
+            return o, pos + 2
+        return error
     if lt < 3:
         return error
     if b1 & 0xF0 == 0xE0:
@@ -97,10 +96,9 @@ def decode_one(text: bytes | str, pos: int) -> tuple[int, int]:
             return error
         if b3 & 0xC0 != 0x80:
             return error
-        o = ((b1 & 0x0F) << 12) | ((b2 & 0x3F) << 6) | (b3 & 0x3F)
-        if o < 0x800:
-            return error
-        return o, pos + 3
+        if (o := ((b1 & 0x0F) << 12) | ((b2 & 0x3F) << 6) | (b3 & 0x3F)) >= 0x800:
+            return o, pos + 3
+        return error
     if lt < 4:
         return error
     if b1 & 0xF8 == 0xF0:
@@ -110,10 +108,9 @@ def decode_one(text: bytes | str, pos: int) -> tuple[int, int]:
             return error
         if b4 & 0xC0 != 0x80:
             return error
-        o = ((b1 & 0x07) << 18) | ((b2 & 0x3F) << 12) | ((b3 & 0x3F) << 6) | (b4 & 0x3F)
-        if o < 0x10000:
-            return error
-        return o, pos + 4
+        if (o := ((b1 & 0x07) << 18) | ((b2 & 0x3F) << 12) | ((b3 & 0x3F) << 6) | (b4 & 0x3F)) >= 0x10000:
+            return o, pos + 4
+        return error
     return error
 
 

urwid/text_layout.py

@@ -461,7 +461,7 @@ def shift_line(
         # existing shift
         amount += segs[0][0]
         if amount:
-            return [(amount, None)] + segs[1:]
+            return [(amount, None), *segs[1:]]
         return segs[1:]
 
     if amount:
@@ -581,8 +581,7 @@ def calc_pos(
     if row < 0 or row >= len(layout):
         raise ValueError("calculate_pos: out of layout row range")
 
-    pos = calc_line_pos(text, layout[row], pref_col)
-    if pos is not None:
+    if (pos := calc_line_pos(text, layout[row], pref_col)) is not None:
         return pos
 
     rows_above = list(range(row - 1, -1, -1))
@@ -590,14 +589,14 @@ def calc_pos(
     while rows_above and rows_below:
         if rows_above:
             r = rows_above.pop(0)
-            pos = calc_line_pos(text, layout[r], pref_col)
-            if pos is not None:
+            if (pos := calc_line_pos(text, layout[r], pref_col)) is not None:
                 return pos
+
         if rows_below:
             r = rows_below.pop(0)
-            pos = calc_line_pos(text, layout[r], pref_col)
-            if pos is not None:
+            if (pos := calc_line_pos(text, layout[r], pref_col)) is not None:
                 return pos
+
     return 0
 
 

urwid/util.py

@@ -143,7 +143,7 @@ def get_encoding() -> str:
 
 
 @contextlib.contextmanager
-def set_temporary_encoding(encoding_name: str) -> Generator[None, None, None]:
+def set_temporary_encoding(encoding_name: str) -> Generator[None]:
     """Internal helper for encoding specific validation in unittests/doctests.
 
     Not exported globally.
@@ -493,24 +493,13 @@ def is_mouse_press(ev: str) -> bool:
 
 
 class MetaSuper(type):
-    """adding .__super"""
+    """Deprecated metaclass.
 
-    def __init__(cls, name: str, bases, d):
-        super().__init__(name, bases, d)
-        if hasattr(cls, f"_{name}__super"):
-            raise AttributeError("Class has same name as one of its super classes")
-
-        @property
-        def _super(self):
-            warnings.warn(
-                f"`{name}.__super` was a deprecated feature for old python versions."
-                f"Please use `super()` call instead.",
-                DeprecationWarning,
-                stacklevel=3,
-            )
-            return super(cls, self)
+    Present only for code compatibility, all logic has been removed.
+    Please move to the last position in the class bases to allow future changes.
+    """
 
-        setattr(cls, f"_{name}__super", _super)
+    __slots__ = ()
 
 
 def int_scale(val: int, val_range: int, out_range: int) -> int:
@@ -534,7 +523,7 @@ def int_scale(val: int, val_range: int, out_range: int) -> int:
     return num // dem
 
 
-class StoppingContext(typing.ContextManager["StoppingContext"]):
+class StoppingContext(contextlib.AbstractContextManager["StoppingContext"]):
     """Context manager that calls ``stop`` on a given object on exit.  Used to
     make the ``start`` method on `MainLoop` and `BaseScreen` optionally act as
     context managers.

urwid/version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.15'
-__version_tuple__ = version_tuple = (2, 6, 15)
+__version__ = version = '3.0.0'
+__version_tuple__ = version_tuple = (3, 0, 0)

urwid/vterm.py

@@ -35,7 +35,6 @@ import termios
 import time
 import traceback
 import typing
-import warnings
 from collections import deque
 from contextlib import suppress
 from dataclasses import dataclass
@@ -248,8 +247,7 @@ class TermCharset:
 
     def apply_mapping(self, char: bytes) -> bytes:
         if self._sgr_mapping or self._g[self.active] == "ibmpc":
-            dec_pos = DEC_SPECIAL_CHARS.find(char.decode("cp437"))
-            if dec_pos >= 0:
+            if (dec_pos := DEC_SPECIAL_CHARS.find(char.decode("cp437"))) >= 0:
                 self.current = "0"
                 return ALT_DEC_SPECIAL_CHARS[dec_pos].encode("cp437")
 
@@ -259,39 +257,6 @@ class TermCharset:
         return char
 
 
-class TermScroller(list):
-    """
-    List subclass that handles the terminal scrollback buffer,
-    truncating it as necessary.
-    """
-
-    SCROLLBACK_LINES = 10000
-
-    def __init__(self, iterable: Iterable[typing.Any]) -> None:
-        warnings.warn(
-            "`TermScroller` is deprecated. Please use `collections.deque` with non-zero `maxlen` instead.",
-            DeprecationWarning,
-            stacklevel=3,
-        )
-        super().__init__(iterable)
-
-    def trunc(self) -> None:
-        if len(self) >= self.SCROLLBACK_LINES:
-            self.pop(0)
-
-    def append(self, obj) -> None:
-        self.trunc()
-        super().append(obj)
-
-    def insert(self, idx: typing.SupportsIndex, obj) -> None:
-        self.trunc()
-        super().insert(idx, obj)
-
-    def extend(self, seq) -> None:
-        self.trunc()
-        super().extend(seq)
-
-
 class TermCanvas(Canvas):
     cacheable = False
 
@@ -375,7 +340,7 @@ class TermCanvas(Canvas):
             lines = self.height // 2
 
         if not up:
-            lines = -lines  # pylint: disable=invalid-unary-operand-type  # type already narrowed
+            lines = -lines
 
         maxscroll = len(self.scrollback_buffer)
         self.scrolling_up += lines
@@ -489,8 +454,7 @@ class TermCanvas(Canvas):
                     continue
 
                 # adjust x axis of scrollback buffer to the current width
-                padding = self.width - len(last_line)
-                if padding > 0:
+                if (padding := self.width - len(last_line)) > 0:
                     last_line += [self.empty_char()] * padding
                 else:
                     last_line = last_line[: self.width]
@@ -549,8 +513,7 @@ class TermCanvas(Canvas):
 
             escbuf.append(num)
 
-        cmd_ = CSI_COMMANDS[char]
-        if cmd_ is not None:
+        if (cmd_ := CSI_COMMANDS[char]) is not None:
             if isinstance(cmd_, CSIAlias):
                 csi_cmd: CSICommand = CSI_COMMANDS[cmd_.alias]  # type: ignore[assignment]
             elif isinstance(cmd_, CSICommand):
@@ -699,11 +662,13 @@ class TermCanvas(Canvas):
 
                 # end multibyte sequence
                 self.utf8_eat_bytes = None
-                sequence = (self.utf8_buffer + bytes([byte])).decode("utf-8", "ignore")
-                if not sequence:
+
+                if sequence := (self.utf8_buffer + bytes([byte])).decode("utf-8", "ignore"):
+                    char = sequence.encode(util.get_encoding(), "replace")
+
+                else:
                     # invalid multibyte sequence, stop processing
                     return
-                char = sequence.encode(util.get_encoding(), "replace")
             else:
                 self.utf8_eat_bytes = None
                 char = bytes([byte])
@@ -1118,6 +1083,14 @@ class TermCanvas(Canvas):
             elif 40 <= attr <= 47:
                 bg = attr - 40
                 colors = max(16, colors)
+            # AIXTERM bright color spec
+            # https://en.wikipedia.org/wiki/ANSI_escape_code
+            elif 90 <= attr <= 97:
+                fg = attr - 90 + 8
+                colors = max(16, colors)
+            elif 100 <= attr <= 107:
+                bg = attr - 100 + 8
+                colors = max(16, colors)
             elif attr in {38, 48}:
                 if idx + 2 < len(attrs) and attrs[idx + 1] == 5:
                     # 8 bit color specification
@@ -1264,7 +1237,7 @@ class TermCanvas(Canvas):
             for x in range(self.width):
                 char = self.term[y][x]
                 attrs = self.reverse_attrspec(char[0], undo=undo)
-                self.term[y][x] = (attrs,) + char[1:]
+                self.term[y][x] = (attrs, *char[1:])
 
     def set_mode(
         self,