Merge pull request #266 from DimitriPapadopoulos/TRY

 Enforce ruff/tryceratops rules (TRY)

Author: jaraco

distutils/command/install_lib.py

@@ -81,9 +81,9 @@ def finalize_options(self):
         if not isinstance(self.optimize, int):
             try:
                 self.optimize = int(self.optimize)
-                if self.optimize not in (0, 1, 2):
-                    raise AssertionError
-            except (ValueError, AssertionError):
+            except ValueError:
+                pass
+            if self.optimize not in (0, 1, 2):
                 raise DistutilsOptionError("optimize must be 0, 1, or 2")
 
     def run(self):

distutils/cygwinccompiler.py

@@ -308,6 +308,9 @@ def check_config_h():
     fn = sysconfig.get_config_h_filename()
     try:
         config_h = pathlib.Path(fn).read_text(encoding='utf-8')
+    except OSError as exc:
+        return (CONFIG_H_UNCERTAIN, f"couldn't read '{fn}': {exc.strerror}")
+    else:
         substring = '__GNUC__'
         if substring in config_h:
             code = CONFIG_H_OK
@@ -316,8 +319,6 @@ def check_config_h():
             code = CONFIG_H_NOTOK
             mention_inflected = 'does not mention'
         return code, f"{fn!r} {mention_inflected} {substring!r}"
-    except OSError as exc:
-        return (CONFIG_H_UNCERTAIN, f"couldn't read '{fn}': {exc.strerror}")
 
 
 def is_cygwincc(cc):

distutils/extension.py

@@ -105,7 +105,7 @@ def __init__(
         **kw,  # To catch unknown keywords
     ):
         if not isinstance(name, str):
-            raise AssertionError("'name' must be a string")
+            raise AssertionError("'name' must be a string")  # noqa: TRY004
         if not (
             isinstance(sources, list)
             and all(isinstance(v, (str, os.PathLike)) for v in sources)

distutils/file_util.py

@@ -140,12 +140,13 @@ def copy_file(  # noqa: C901
         if not (os.path.exists(dst) and os.path.samefile(src, dst)):
             try:
                 os.link(src, dst)
-                return (dst, 1)
             except OSError:
                 # If hard linking fails, fall back on copying file
                 # (some special filesystems don't support hard linking
                 #  even under Unix, see issue #8876).
                 pass
+            else:
+                return (dst, 1)
     elif link == 'sym':
         if not (os.path.exists(dst) and os.path.samefile(src, dst)):
             os.symlink(src, dst)

distutils/msvc9compiler.py

@@ -154,7 +154,7 @@ def load_macros(self, version):
             if version >= 8.0:
                 self.set_macro("FrameworkSDKDir", NET_BASE, "sdkinstallrootv2.0")
             else:
-                raise KeyError("sdkinstallrootv2.0")
+                raise KeyError("sdkinstallrootv2.0")  # noqa: TRY301
         except KeyError:
             raise DistutilsPlatformError(
                 """Python was built with Visual Studio 2008;

ruff.toml

@@ -11,13 +11,15 @@ extend-select = [
 	"PERF",
 	"RUF010",
 	"RUF100",
+	"TRY",
 	"UP",
 ]
 ignore = [
 	# local
 	"PERF203",
+	"TRY003",
 
-	# https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
+  # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
 	"W191",
 	"E111",
 	"E114",