Merge pull request numpy#26879 from DimitriPapadopoulos/SIM

MAINT: start applying ruff/flake8-simplify rules (SIM)

Author: charris

numpy/_core/_dtype.py

@@ -277,9 +277,7 @@ def _is_packed(dtype):
     if align:
         total_offset = _aligned_offset(total_offset, max_alignment)
 
-    if total_offset != dtype.itemsize:
-        return False
-    return True
+    return total_offset == dtype.itemsize
 
 
 def _struct_list_str(dtype):

numpy/_core/code_generators/generate_umath.py

@@ -1376,10 +1376,9 @@ def make_arrays(funcdict):
         funclist = []
         datalist = []
         siglist = []
-        k = 0
         sub = 0
 
-        for t in uf.type_descriptions:
+        for k, t in enumerate(uf.type_descriptions):
             cfunc_alias = t.cfunc_alias if t.cfunc_alias else name
             cfunc_fname = None
             if t.func_data is FullTypeDescr:
@@ -1439,8 +1438,6 @@ def make_arrays(funcdict):
             for x in t.in_ + t.out:
                 siglist.append('NPY_%s' % (english_upper(chartoname[x]),))
 
-            k += 1
-
         if funclist or siglist or datalist:
             funcnames = ', '.join(funclist)
             signames = ', '.join(siglist)

numpy/_core/numerictypes.py

@@ -223,12 +223,10 @@ def issctype(rep):
         return False
     try:
         res = obj2sctype(rep)
-        if res and res != object_:
-            return True
-        return False
     except Exception:
         return False
-
+    else:
+        return res and res != object_
 
 @set_module('numpy')
 def obj2sctype(rep, default=None):

numpy/_core/tests/test_cpu_features.py

@@ -85,10 +85,7 @@ def cpu_have(self, feature_name):
         map_names = self.features_map.get(feature_name, feature_name)
         if isinstance(map_names, str):
             return map_names in self.features_flags
-        for f in map_names:
-            if f in self.features_flags:
-                return True
-        return False
+        return any(f in self.features_flags for f in map_names)
 
     def load_flags_cpuinfo(self, magic_key):
         self.features_flags = self.get_cpuinfo_item(magic_key)

numpy/distutils/extension.py

@@ -93,15 +93,9 @@ def __init__(
         return
 
     def has_cxx_sources(self):
-        for source in self.sources:
-            if cxx_ext_re(str(source)):
-                return True
-        return False
+        return any(cxx_ext_re(str(source)) for source in self.sources)
 
     def has_f2py_sources(self):
-        for source in self.sources:
-            if fortran_pyf_ext_re(source):
-                return True
-        return False
+        return any(fortran_pyf_ext_re(source) for source in self.sources)
 
 # class Extension

numpy/distutils/misc_util.py

@@ -489,10 +489,7 @@ def is_string(s):
 
 def all_strings(lst):
     """Return True if all items in lst are string objects. """
-    for item in lst:
-        if not is_string(item):
-            return False
-    return True
+    return all(is_string(item) for item in lst)
 
 def is_sequence(seq):
     if is_string(seq):
@@ -527,17 +524,11 @@ def get_language(sources):
 
 def has_f_sources(sources):
     """Return True if sources contains Fortran files """
-    for source in sources:
-        if fortran_ext_match(source):
-            return True
-    return False
+    return any(fortran_ext_match(source) for source in sources)
 
 def has_cxx_sources(sources):
     """Return True if sources contains C++ files """
-    for source in sources:
-        if cxx_ext_match(source):
-            return True
-    return False
+    return any(cxx_ext_match(source) for source in sources)
 
 def filter_sources(sources):
     """Return four lists of filenames containing

numpy/f2py/tests/test_array_from_pyobj.py

@@ -90,10 +90,7 @@ def __repr__(self):
         return "Intent(%r)" % (self.intent_list)
 
     def is_intent(self, *names):
-        for name in names:
-            if name not in self.intent_list:
-                return False
-        return True
+        return all(name in self.intent_list for name in names)
 
     def is_intent_exact(self, *names):
         return len(self.intent_list) == len(names) and self.is_intent(*names)

numpy/f2py/tests/util.py

@@ -220,10 +220,7 @@ def check_language(lang, code_snippet=None):
             cwd=tmpdir,
             capture_output=True,
         )
-        if runmeson.returncode == 0:
-            return True
-        else:
-            return False
+        return runmeson.returncode == 0
     finally:
         shutil.rmtree(tmpdir)
     return False

numpy/lib/_arraypad_impl.py

@@ -860,7 +860,7 @@ def pad(array, pad_width, mode='constant', **kwargs):
 
     elif mode in {"reflect", "symmetric"}:
         method = kwargs.get("reflect_type", "even")
-        include_edge = True if mode == "symmetric" else False
+        include_edge = mode == "symmetric"
         for axis, (left_index, right_index) in zip(axes, pad_width):
             if array.shape[axis] == 1 and (left_index > 0 or right_index > 0):
                 # Extending singleton dimension for 'reflect' is legacy

numpy/lib/_datasource.py

@@ -271,10 +271,7 @@ def _iswritemode(self, mode):
 
         # Currently only used to test the bz2 files.
         _writemodes = ("w", "+")
-        for c in mode:
-            if c in _writemodes:
-                return True
-        return False
+        return any(c in _writemodes for c in mode)
 
     def _splitzipext(self, filename):
         """Split zip extension from filename and return filename.