Upgrade ruff to 0.2.0

* Adopt config format
* Fix deprecation warnings and adopt typing annotations:
* * palette_test.py
* * `Canvas.content()`

examples/palette_test.py

@@ -27,6 +27,7 @@
 from __future__ import annotations
 
 import re
+import typing
 
 import urwid
 
@@ -352,11 +353,11 @@ def main():
  mode_radio_buttons = []
  chart_radio_buttons = []
 
- def fcs(widget):
+ def fcs(widget) -> urwid.AttrMap:
  # wrap widgets that can take focus
  return urwid.AttrMap(widget, None, "focus")
 
- def set_mode(colors, is_foreground_chart):
+ def set_mode(colors: int, is_foreground_chart: bool) -> None:
  # set terminal mode and redraw chart
  screen.set_terminal_properties(colors)
  screen.reset_default_terminal_palette()
@@ -369,23 +370,23 @@ def set_mode(colors, is_foreground_chart):
  txt = chart_fn(chart, "default", colors)
  lb[chart_offset] = urwid.Text(txt, wrap=urwid.CLIP)
 
- def on_mode_change(rb, state, colors):
+ def on_mode_change(colors: int, rb: urwid.RadioButton, state: bool) -> None:
  # if this radio button is checked
  if state:
  is_foreground_chart = chart_radio_buttons[0].state
  set_mode(colors, is_foreground_chart)
 
- def mode_rb(text, colors, state=False):
+ def mode_rb(text: str, colors: int, state: bool = False) -> urwid.AttrMap:
  # mode radio buttons
  rb = urwid.RadioButton(mode_radio_buttons, text, state)
- urwid.connect_signal(rb, "change", on_mode_change, colors)
+ urwid.connect_signal(rb, "change", on_mode_change, user_args=(colors,))
  return fcs(rb)
 
- def on_chart_change(rb, state):
+ def on_chart_change(rb: urwid.RadioButton, state: bool) -> None:
  # handle foreground check box state change
  set_mode(screen.colors, state)
 
- def click_exit(button):
+ def click_exit(button) -> typing.NoReturn:
  raise urwid.ExitMainLoop()
 
  lb.extend(
@@ -423,7 +424,7 @@ def click_exit(button):
 
  set_mode(16, True) # displays the chart
 
- def unhandled_input(key):
+ def unhandled_input(key: str | tuple[str, int, int, int]) -> None:
  if key in ("Q", "q", "esc"):
  raise urwid.ExitMainLoop()
 

pyproject.toml

@@ -149,14 +149,11 @@ ignore_missing_imports = true
 
 [tool.ruff]
 line-length = 120
-show-source = true
+output-format = "full"
 target-version = "py37"
-ignore-init-module-imports = true
-
-[tool.ruff.per-file-ignores]
-"__init__.py" = ["F401", "SIM105"]
 
 [tool.ruff.lint]
+ignore-init-module-imports = true
 extend-select = [
  "E",
  "W", # also pycodestyle warnings
@@ -185,6 +182,10 @@ extend-ignore = [
  "TRY003", #long messages prepare outside, ...
 ]
 
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401", "SIM105"]
+
+
 [tool.ruff.lint.isort]
 known-third-party = []
 

ruff-requirements.txt

@@ -1 +1 @@
-ruff == 0.1.14
+ruff==0.2.0

urwid/canvas.py

@@ -42,6 +42,8 @@
 if typing.TYPE_CHECKING:
  from collections.abc import Hashable, Iterable, Sequence
 
+ from typing_extensions import Literal
+
  from .widget import Widget
 
 
@@ -294,7 +296,7 @@ def content(
  cols: int | None = None,
  rows: int | None = None,
  attr=None,
- ) -> Iterable[list[tuple[object, object, bytes]]]:
+ ) -> Iterable[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
  raise NotImplementedError()
 
  def cols(self):
@@ -492,7 +494,7 @@ def content(
  cols: int | None = 0,
  rows: int | None = 0,
  attr=None,
- ) -> Iterable[tuple[object, object, bytes]]:
+ ) -> Iterable[tuple[object, Literal["0", "U"] | None, bytes]]:
  """
  Return the canvas content as a list of rows where each row
  is a list of (attr, cs, text) tuples.
@@ -560,7 +562,7 @@ class BlankCanvas(Canvas):
  """
 
  def __init__(self) -> None:
- super().__init__(None)
+ super().__init__()
 
  def content(
  self,
@@ -569,7 +571,7 @@ def content(
  cols: int | None = 0,
  rows: int | None = 0,
  attr=None,
- ) -> Iterable[list[tuple[object, object, bytes]]]:
+ ) -> Iterable[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
  """
  return (cols, rows) of spaces with default attributes.
  """
@@ -621,7 +623,7 @@ def content(
  cols: int | None = None,
  rows: int | None = None,
  attr=None,
- ) -> Iterable[list[tuple[object, object, bytes]]]:
+ ) -> Iterable[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
  if cols is None:
  cols = self.size[0]
  if rows is None:
@@ -724,7 +726,7 @@ def content(
  cols: int | None = None,
  rows: int | None = None,
  attr=None,
- ) -> Iterable[list[tuple[object, object, bytes]]]:
+ ) -> Iterable[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
  """
  Return the canvas content as a list of rows where each row
  is a list of (attr, cs, text) tuples.

urwid/vterm.py

@@ -1441,7 +1441,7 @@ def content(
  cols: int | None = None,
  rows: int | None = None,
  attr=None,
- ) -> Iterable[list[tuple[object, object, bytes]]]:
+ ) -> Iterable[list[tuple[object, Literal["0", "U"] | None, bytes]]]:
  if self.scrolling_up == 0:
  yield from self.term
  else: