Accept suggestions from new toolchain

rec · rec · commit a322af55d42c · 2026-02-03T13:27:10.000+01:00
diff --git a/nc/__init__.py b/nc/__init__.py
@@ -68,11 +68,12 @@
     #   (122, 110, 250) is closest to Slate blue 1 = 131 111 255
     #   (56, 218, 180) is closest to Turquoise = 64 224 208
 """
-from . import colors as _colors
-from . import color as _color
-from functools import cached_property
-from typing import Iterator
 import sys
+from functools import cached_property
+from collections.abc import Iterator
+
+from . import color as _color
+from . import colors as _colors
 
 _DEFAULT_PALETTES = "wikipedia", "x11", "juce"
 
diff --git a/nc/__main__.py b/nc/__main__.py
@@ -1,10 +1,9 @@
-from nc import Color
-from nc import demo
-from nc import terminal
 import argparse
-import nc
 import sys
 
+import nc
+from nc import Color, demo, terminal
+
 DEFAULT_COMMAND = "all"
 
 
@@ -37,10 +36,10 @@ def main(sys_args, color_count=None):
     context = terminal.Context(color_count)
     first = True
     for name, color in colors:
-        assert type(name) is str
+        assert isinstance(name, str)
         assert "Color" in type(color).__name__, type(color).__name__
         background = nc.black if sum(color) >= 0x180 else nc.white
-        msg = "%s%s: %s" % ("" if first else "\n", name, tuple(color))
+        msg = "{}{}: {}".format("" if first else "\n", name, tuple(color))
         first = False
         if context:
             with context(color, background, print):
diff --git a/nc/color.py b/nc/color.py
@@ -1,10 +1,9 @@
-from functools import cached_property
-from typing import Tuple
 import collections
 import colorsys
 import math
 import numbers
 import typing as t
+from functools import cached_property
 
 from typing_extensions import Protocol
 
@@ -50,7 +49,7 @@ def closest(self) -> "Color":
 
     def distance2(self, other) -> int:
         """Return the square of the distance between this and another color"""
-        d = (i - j for i, j in zip(self, other))
+        d = (i - j for i, j in zip(self, other, strict=False))
         return sum(i * i for i in d)
 
     def distance(self, other) -> float:
diff --git a/nc/colors.py b/nc/colors.py
@@ -1,9 +1,10 @@
-from . import color
-from functools import cached_property
 import importlib
 import re
 import string
 import typing as t
+from functools import cached_property
+
+from . import color
 
 _ALLOWED = set(string.ascii_letters + string.digits)
 
@@ -94,7 +95,7 @@ def __getattr__(self, name: str) -> color.Color:
         try:
             return self[name]
         except KeyError:
-            raise AttributeError(name)
+            raise AttributeError(name) from None
 
     def __setattr__(self, name, value):
         if name.startswith("_"):
@@ -174,7 +175,7 @@ def _canonical_name(self, name) -> str:
         return "".join(i for i in name if i in _ALLOWED)
 
     @cached_property
-    def _colors(self) -> t.Dict[str, Color]:
+    def _colors(self) -> t.Dict[str, color.Color]:
         return {k: self.Color(*v) for k, v in self._name_to_rgb.items()}
 
     @cached_property
diff --git a/nc/demo.py b/nc/demo.py
@@ -1,8 +1,9 @@
-from . import terminal
 import subprocess
 import sys
 import time
 
+from . import terminal
+
 DEFAULT_COLUMNS = 64
 DEMO_CHAR = "•"
 
diff --git a/nc/terminal.py b/nc/terminal.py
@@ -1,8 +1,9 @@
-from .colors import Colors
 import contextlib
 import functools
 import subprocess
 
+from .colors import Colors
+
 TERMINAL_ENVIRONMENT_VAR = "_NC_TERMINAL_COLOR_COUNT"
 SIZES = 256, 16, 8
 
@@ -11,7 +12,7 @@ def context(fg=None, bg=None, print=print, count=None):
     return Context(count)(fg, bg, print)
 
 
-@functools.lru_cache()
+@functools.lru_cache
 def color_count():
     cmd = "tput", "colors"
     try:
@@ -65,4 +66,4 @@ def color_codes(color, coder):
             yield
 
 
-Context = functools.lru_cache()(_Context)
+Context = functools.lru_cache(_Context)
diff --git a/test/nc/print_mocker.py b/test/nc/print_mocker.py
@@ -1,6 +1,6 @@
-from unittest import mock
 import contextlib
 import io
+from unittest import mock
 
 
 @contextlib.contextmanager
diff --git a/test/nc/test_color.py b/test/nc/test_color.py
@@ -1,7 +1,7 @@
-from nc import COLORS
-from nc import Color
 import unittest
 
+from nc import COLORS, Color
+
 
 class ColorTest(unittest.TestCase):
     def test_empty(self):
diff --git a/test/nc/test_colors.py b/test/nc/test_colors.py
@@ -1,9 +1,8 @@
-from nc import COLORS
-from nc import Color
-from nc import Colors
-from nc.palette import juce
 import unittest
 
+from nc import COLORS, Color, Colors
+from nc.palette import juce
+
 
 class ColorsTest(unittest.TestCase):
     def test_colors(self):
diff --git a/test/nc/test_custom_colors.py b/test/nc/test_custom_colors.py
@@ -1,6 +1,7 @@
-import nc
 import unittest
 
+import nc
+
 
 class CustomColorsTest(unittest.TestCase):
     def test_dict_module(self):
diff --git a/test/nc/test_demo.py b/test/nc/test_demo.py
@@ -1,6 +1,8 @@
-from .print_mocker import print_mocker
+from unittest import TestCase, mock
+
 from nc import demo
-from unittest import mock, TestCase
+
+from .print_mocker import print_mocker
 
 
 @mock.patch("time.sleep", return_value=None)
diff --git a/test/nc/test_main.py b/test/nc/test_main.py
@@ -1,6 +1,8 @@
-from .print_mocker import print_mocker
+from unittest import TestCase, mock
+
 from nc.__main__ import main
-from unittest import mock, TestCase
+
+from .print_mocker import print_mocker
 
 
 class TestMain(TestCase):
diff --git a/test/nc/test_module.py b/test/nc/test_module.py
@@ -1,6 +1,7 @@
-import nc
 import unittest
 
+import nc
+
 
 class ModuleTest(unittest.TestCase):
     def test_basics(self):
diff --git a/test/nc/test_palette.py b/test/nc/test_palette.py
@@ -1,6 +1,7 @@
-from nc import Colors
 import unittest
 
+from nc import Colors
+
 HTML = Colors("html")
 TERMINAL_8 = Colors("terminal8")
 TERMINAL_16 = Colors("terminal16")
diff --git a/test/nc/test_terminal.py b/test/nc/test_terminal.py
@@ -1,7 +1,8 @@
-from nc import terminal
-from unittest import mock, TestCase
 import functools
+from unittest import TestCase, mock
+
 import nc
+from nc import terminal
 
 
 @mock.patch("time.sleep", return_value=None)
