Accept suggestions from new toolchain

rec · rec · commit df989d12e2e8 · 2026-02-03T14:16:45.000+01:00
diff --git a/cfgs/__init__.py b/cfgs/__init__.py
@@ -7,17 +7,16 @@
 Fully compliant with the XDG Base Directory Specification.
 """
 
-from enum import Enum
-from pathlib import Path
-from typing import Any, Dict, Optional, Tuple, Union
 import copy
 import dataclasses as dc
 import json
 import os
-import os
 import sys
+from enum import Enum
+from pathlib import Path
+from typing import Any, Dict, Optional, Tuple, Union
 
-File = Tuple[Union[Path, str]]
+File = tuple[Union[Path, str]]
 _NONE = object()
 
 
@@ -50,7 +49,7 @@ def load(self, *files: File):
     def load_from_environ(
         self,
         prefix: str,
-        environ: Optional[Dict] = None,
+        environ: dict | None = None,
         verbose: bool = True,
     ):
         if environ is None:
@@ -268,7 +267,7 @@ def open(self, filename=None):
         if not filename:
             basename = os.path.basename(self.home)
             suffix = FORMAT_TO_SUFFIX[self.format.name]
-            filename = '%s%s' % (basename, suffix)
+            filename = '{}{}'.format(basename, suffix)
         elif filename.startswith('/'):
             filename = filename[1:]
 
@@ -283,7 +282,7 @@ def all_files(self, filename):
             full_path = os.path.join(p, filename)
             try:
                 yield open(full_path) and full_path
-            except IOError:
+            except OSError:
                 pass
 
     def full_name(self, filename):
@@ -322,7 +321,7 @@ def read(self):
         try:
             with open(self.filename) as fp:
                 self.contents = self.format.read(fp)
-        except IOError:
+        except OSError:
             self.contents = self.format.create()
         return self.contents
 
@@ -510,7 +509,7 @@ def __init__(self):
     def read(self, fp):
         """Read contents from an open file in this format"""
         contents = self.create()
-        contents.readfp(fp)
+        contents.read_file(fp)
         return contents
 
     def write(self, contents, fp):
@@ -519,7 +518,7 @@ def write(self, contents, fp):
 
     def create(self):
         """Return new, empty contents"""
-        return self._parser.SafeConfigParser()
+        return self._parser.ConfigParser()
 
     def as_dict(self, contents):
         """Convert the contents to a dict"""
diff --git a/test/test_cfgs.py b/test/test_cfgs.py
@@ -1,15 +1,16 @@
 import dataclasses as dc
-from cfgs import Configs
 from typing import List
 
+from cfgs import Configs
+
 
 def field(factory):
     return dc.field(default_factory=factory)
 
 
 @dc.dataclass
 class Audio(Configs):
-    levels: List[float] = field(list)
+    levels: list[float] = field(list)
 
 
 @dc.dataclass
diff --git a/test/test_dirs.py b/test/test_dirs.py
@@ -1,8 +1,10 @@
-from pyfakefs.fake_filesystem_unittest import TestCase as FakeTestCase
-import cfgs
 import json
 import platform
 
+from pyfakefs.fake_filesystem_unittest import TestCase as FakeTestCase
+
+import cfgs
+
 
 class TestCase(FakeTestCase):
     maxDiff = 2048
@@ -160,7 +162,7 @@ class CacheTest(TestCase):
         ('five', '55555'),
         ('six', '666666'),
     )
-    EXPECTED = set(f for (f, c) in FILE_CONTENTS)
+    EXPECTED = {f for (f, c) in FILE_CONTENTS}
 
     def test_cache1(self):
         cache, listdir = self._create_cache(0, False)
