Repair the violations from Ruff 0.16's expanded defaults.

Ref jaraco/skeleton#210.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: jaraco

importlib_resources/__init__.py

@@ -25,12 +25,12 @@
 from .abc import ResourceReader
 
 __all__ = [
-    'Package',
     'Anchor',
+    'Package',
     'ResourceReader',
     'as_file',
-    'files',
     'contents',
+    'files',
     'is_resource',
     'open_binary',
     'open_text',

importlib_resources/_common.py

@@ -7,22 +7,22 @@
 import pathlib
 import tempfile
 import types
-from typing import Optional, cast
+from typing import cast
 
 from .abc import ResourceReader, Traversable
 
 Package = types.ModuleType | str
 Anchor = Package
 
 
-def files(anchor: Optional[Anchor] = None) -> Traversable:
+def files(anchor: Anchor | None = None) -> Traversable:
     """
     Get a Traversable resource for an anchor.
     """
     return from_package(resolve(anchor))
 
 
-def get_resource_reader(package: types.ModuleType) -> Optional[ResourceReader]:
+def get_resource_reader(package: types.ModuleType) -> ResourceReader | None:
     """
     Return the package's loader if it's a ResourceReader.
     """
@@ -39,7 +39,7 @@ def get_resource_reader(package: types.ModuleType) -> Optional[ResourceReader]:
 
 
 @functools.singledispatch
-def resolve(cand: Optional[Anchor]) -> types.ModuleType:
+def resolve(cand: Anchor | None) -> types.ModuleType:
     return cast(types.ModuleType, cand)
 
 

importlib_resources/_itertools.py

@@ -30,8 +30,8 @@ def only(iterable, default=None, too_long=None):
         pass
     else:
         msg = (
-            'Expected exactly one item in iterable, but got {!r}, {!r}, '
-            'and perhaps more.'.format(first_value, second_value)
+            f'Expected exactly one item in iterable, but got {first_value!r}, '
+            f'{second_value!r}, and perhaps more.'
         )
         raise too_long or ValueError(msg)
 

importlib_resources/abc.py

@@ -8,9 +8,7 @@
     BinaryIO,
     Literal,
     NoReturn,
-    Optional,
     Protocol,
-    Text,
     TextIO,
     overload,
     runtime_checkable,
@@ -25,7 +23,7 @@ class ResourceReader(metaclass=abc.ABCMeta):
     """Abstract base class for loaders to provide resource reading support."""
 
     @abc.abstractmethod
-    def open_resource(self, resource: Text) -> BinaryIO:
+    def open_resource(self, resource: str) -> BinaryIO:
         """Return an opened, file-like object for binary reading.
 
         The 'resource' argument is expected to represent only a file name.
@@ -37,7 +35,7 @@ def open_resource(self, resource: Text) -> BinaryIO:
         raise FileNotFoundError
 
     @abc.abstractmethod
-    def resource_path(self, resource: Text) -> Text:
+    def resource_path(self, resource: str) -> str:
         """Return the file system path to the specified resource.
 
         The 'resource' argument is expected to represent only a file name.
@@ -50,7 +48,7 @@ def resource_path(self, resource: Text) -> Text:
         raise FileNotFoundError
 
     @abc.abstractmethod
-    def is_resource(self, path: Text) -> bool:
+    def is_resource(self, path: str) -> bool:
         """Return True if the named 'path' is a resource.
 
         Files are resources, directories are not.
@@ -90,9 +88,7 @@ def read_bytes(self) -> bytes:
         with self.open('rb') as strm:
             return strm.read()
 
-    def read_text(
-        self, encoding: Optional[str] = None, errors: Optional[str] = None
-    ) -> str:
+    def read_text(self, encoding: str | None = None, errors: str | None = None) -> str:
         """
         Read contents of self as text
         """

importlib_resources/compat/py39.py

@@ -3,7 +3,7 @@
 __all__ = ['ZipPath']
 
 
-if sys.version_info >= (3, 10):
+if sys.version_info >= (3, 10):  # noqa: UP036 (shim retained; removal is a separate change)
     from zipfile import Path as ZipPath
 else:
     from zipp import Path as ZipPath

importlib_resources/tests/test_contents.py

@@ -6,7 +6,7 @@
 
 
 class ContentsTests:
-    expected = {
+    expected = {  # noqa: RUF012 (never mutated; overridden by subclasses)
         '__init__.py',
         'binary.file',
         'subdirectory',
@@ -30,7 +30,7 @@ class ContentsZipTests(ContentsTests, util.ZipSetup, unittest.TestCase):
 class ContentsNamespaceTests(ContentsTests, util.DiskSetup, unittest.TestCase):
     MODULE = 'namespacedata01'
 
-    expected = {
+    expected = {  # noqa: RUF012 (never mutated; overridden by subclasses)
         # no __init__ because of namespace design
         'binary.file',
         'subdirectory',

importlib_resources/tests/test_files.py

@@ -88,7 +88,7 @@ def load_fixture(self, name):
 
 
 class ModulesFiles:
-    spec = {
+    spec = {  # noqa: RUF012 (never mutated; overridden by subclasses)
         'mod.py': '',
         'res.txt': 'resources are the best',
     }
@@ -118,7 +118,7 @@ class ImplicitContextFiles:
         val = res.files().joinpath('res.txt').read_text(encoding='utf-8')
         """
     )
-    spec = {
+    spec = {  # noqa: RUF012 (never mutated; overridden by subclasses)
         'somepkg': {
             '__init__.py': set_val,
             'submod.py': set_val,

importlib_resources/tests/test_functional.py

@@ -123,7 +123,7 @@ def test_open_text(self):
             resources.open_text(self.anchor01)
         with self.assertRaises((OSError, resources.abc.TraversalError)):
             resources.open_text(self.anchor01, 'no-such-file')
-        with resources.open_text(self.anchor01, 'utf-16.file') as f:
+        with resources.open_text(self.anchor01, 'utf-16.file') as f:  # noqa: SIM117 (kept in sync with CPython)
             with self.assertRaises(UnicodeDecodeError):
                 f.read()
         with resources.open_text(
@@ -154,10 +154,10 @@ def test_open_binary(self):
                 assert f.read() == b'a resource'
 
     def test_path(self):
-        with resources.path(self.anchor01, 'utf-8.file') as path:
+        with resources.path(self.anchor01, 'utf-8.file') as path:  # noqa: SIM117 (kept in sync with CPython)
             with open(str(path), encoding='utf-8') as f:
                 assert f.read() == 'Hello, UTF-8 world!\n'
-        with resources.path(self.anchor01) as path:
+        with resources.path(self.anchor01) as path:  # noqa: SIM117 (kept in sync with CPython)
             with open(os.path.join(path, 'utf-8.file'), encoding='utf-8') as f:
                 assert f.read() == 'Hello, UTF-8 world!\n'
 
@@ -223,7 +223,7 @@ def test_text_errors(self):
             resources.read_text,
             resources.open_text,
         ):
-            with self.subTest(func=func):
+            with self.subTest(func=func):  # noqa: SIM117 (kept in sync with CPython)
                 # Multiple path arguments need explicit encoding argument.
                 with self.assertRaises(TypeError):
                     func(

importlib_resources/tests/util.py

@@ -145,7 +145,7 @@ def test_useless_loader(self):
         '__init__.py': '',
         'binary.file': bytes(range(4)),
         'utf-16.file': '\ufeffHello, UTF-16 world!\n'.encode('utf-16-le'),
-        'utf-8.file': 'Hello, UTF-8 world!\n'.encode('utf-8'),
+        'utf-8.file': b'Hello, UTF-8 world!\n',
         'subdirectory': {
             '__init__.py': '',
             'binary.file': bytes(range(4, 8)),
@@ -160,7 +160,7 @@ def test_useless_loader(self):
     namespacedata01={
         'binary.file': bytes(range(4)),
         'utf-16.file': '\ufeffHello, UTF-16 world!\n'.encode('utf-16-le'),
-        'utf-8.file': 'Hello, UTF-8 world!\n'.encode('utf-8'),
+        'utf-8.file': b'Hello, UTF-8 world!\n',
         'subdirectory': {
             'binary.file': bytes(range(12, 16)),
         },