Merge pull request #4450 from DimitriPapadopoulos/TRY

Enforce ruff/tryceratops rule TRY300

pkg_resources/extern/__init__.py

@@ -41,14 +41,14 @@ def load_module(self, fullname: str):
         """
         root, base, target = fullname.partition(self.root_name + '.')
         for prefix in self.search_path:
+            extant = prefix + target
             try:
-                extant = prefix + target
                 __import__(extant)
-                mod = sys.modules[extant]
-                sys.modules[fullname] = mod
-                return mod
             except ImportError:
-                pass
+                continue
+            mod = sys.modules[extant]
+            sys.modules[fullname] = mod
+            return mod
         else:
             raise ImportError(
                 "The '{target}' package is required; "

ruff.toml

@@ -14,9 +14,11 @@ extend-select = [
 	"F404", # late-future-import
 	"PYI", # flake8-pyi
 	"UP", # pyupgrade
+	"TRY",
 	"YTT", # flake8-2020
 ]
 ignore = [
+	"TRY301", # raise-within-try, it's handy
 	"UP015", # redundant-open-modes, explicit is preferred
 	"UP030", # temporarily disabled
 	"UP031", # temporarily disabled

setuptools/__init__.py

@@ -57,9 +57,9 @@ def _get_project_config_files(self, filenames=None):
             """Ignore ``pyproject.toml``, they are not related to setup_requires"""
             try:
                 cfg, toml = super()._split_standard_project_metadata(filenames)
-                return cfg, ()
             except Exception:
                 return filenames, ()
+            return cfg, ()
 
         def finalize_options(self):
             """

setuptools/command/easy_install.py

@@ -102,9 +102,9 @@ def _to_bytes(s):
 def isascii(s):
     try:
         s.encode('ascii')
-        return True
     except UnicodeError:
         return False
+    return True
 
 
 def _one_liner(text):

setuptools/config/_validate_pyproject/formats.py

@@ -91,9 +91,9 @@ def pep508(value: str) -> bool:
         """
         try:
             _req.Requirement(value)
-            return True
         except _req.InvalidRequirement:
             return False
+        return True
 
 except ImportError:  # pragma: no cover
     _logger.warning(

setuptools/depends.py

@@ -58,11 +58,11 @@ def get_version(self, paths=None, default="unknown"):
         if self.attribute is None:
             try:
                 f, p, i = find_module(self.module, paths)
-                if f:
-                    f.close()
-                return default
             except ImportError:
                 return None
+            if f:
+                f.close()
+            return default
 
         v = get_module_constant(self.module, self.attribute, default, paths)
 

setuptools/extension.py

@@ -16,10 +16,9 @@ def _have_cython():
     try:
         # from (cython_impl) import build_ext
         __import__(cython_impl, fromlist=['build_ext']).build_ext
-        return True
     except Exception:
-        pass
-    return False
+        return False
+    return True
 
 
 # for compatibility

setuptools/extern/__init__.py

@@ -32,14 +32,14 @@ def load_module(self, fullname):
         """
         root, base, target = fullname.partition(self.root_name + '.')
         for prefix in self.search_path:
+            extant = prefix + target
             try:
-                extant = prefix + target
                 __import__(extant)
-                mod = sys.modules[extant]
-                sys.modules[fullname] = mod
-                return mod
             except ImportError:
-                pass
+                continue
+            mod = sys.modules[extant]
+            sys.modules[fullname] = mod
+            return mod
         else:
             raise ImportError(
                 "The '{target}' package is required; "

setuptools/tests/test_sdist.py

@@ -122,9 +122,9 @@ def touch(path):
 def symlink_or_skip_test(src, dst):
     try:
         os.symlink(src, dst)
-        return dst
     except (OSError, NotImplementedError):
         pytest.skip("symlink not supported in OS")
+    return dst
 
 
 class TestSdistTest: