Merge pull request numpy#27293 from DimitriPapadopoulos/B

MAINT: Keep applying ruff/flake8-bugbear rules (B)

Author: mhvk

benchmarks/benchmarks/bench_ma.py

@@ -213,7 +213,7 @@ def time_methods_getitem(self, margs, msize):
             mdat = self.nmxs
         elif msize == 'big':
             mdat = self.nmxl
-        getattr(mdat, '__getitem__')(margs)
+        mdat.__getitem__(margs)
 
 
 class MAMethodSetItem(Benchmark):
@@ -235,7 +235,7 @@ def time_methods_setitem(self, margs, mset, msize):
             mdat = self.nmxs
         elif msize == 'big':
             mdat = self.nmxl
-        getattr(mdat, '__setitem__')(margs, mset)
+        mdat.__setitem__(margs, mset)
 
 
 class Where(Benchmark):

benchmarks/benchmarks/bench_ufunc.py

@@ -258,7 +258,7 @@ def time_methods_getitem(self, margs, msize):
             mdat = self.xs
         elif msize == 'big':
             mdat = self.xl
-        getattr(mdat, '__getitem__')(margs)
+        mdat.__getitem__(margs)
 
 
 class NDArraySetItem(Benchmark):

doc/neps/tools/build_index.py

@@ -38,7 +38,7 @@ def nep_metadata():
 
             # The title should be the first line after a line containing only
             # * or = signs.
-            for i, line in enumerate(lines[:-1]):
+            for line in lines[:-1]:
                 chars = set(line.rstrip())
                 if len(chars) == 1 and ("=" in chars or "*" in chars):
                     break

numpy/_core/numeric.py

@@ -2705,7 +2705,7 @@ def astype(x, dtype, /, *, copy=True, device=None):
 
 def extend_all(module):
     existing = set(__all__)
-    mall = getattr(module, '__all__')
+    mall = module.__all__
     for a in mall:
         if a not in existing:
             __all__.append(a)

numpy/_core/tests/test_deprecations.py

@@ -488,7 +488,7 @@ class TestMachAr(_DeprecationTestCase):
     warning_cls = DeprecationWarning
 
     def test_deprecated_module(self):
-        self.assert_deprecated(lambda: getattr(np._core, "MachAr"))
+        self.assert_deprecated(lambda: np._core.MachAr)
 
 
 class TestQuantileInterpolationDeprecation(_DeprecationTestCase):

numpy/_core/tests/test_simd.py

@@ -160,7 +160,7 @@ def test_operators_logical(self):
         assert vor == data_or
 
         data_xor = [a ^ b for a, b in zip(data_a, data_b)]
-        vxor = getattr(self, "xor")(vdata_a, vdata_b)
+        vxor = self.xor(vdata_a, vdata_b)
         assert vxor == data_xor
 
         vnot = getattr(self, "not")(vdata_a)
@@ -171,15 +171,15 @@ def test_operators_logical(self):
             return
 
         data_andc = [(a & ~b) & 0xFF for a, b in zip(data_a, data_b)]
-        vandc = getattr(self, "andc")(vdata_a, vdata_b)
+        vandc = self.andc(vdata_a, vdata_b)
         assert data_andc == vandc
 
         data_orc = [(a | ~b) & 0xFF for a, b in zip(data_a, data_b)]
-        vorc = getattr(self, "orc")(vdata_a, vdata_b)
+        vorc = self.orc(vdata_a, vdata_b)
         assert data_orc == vorc
 
         data_xnor = [~(a ^ b) & 0xFF for a, b in zip(data_a, data_b)]
-        vxnor = getattr(self, "xnor")(vdata_a, vdata_b)
+        vxnor = self.xnor(vdata_a, vdata_b)
         assert data_xnor == vxnor
 
     def test_tobits(self):
@@ -1072,7 +1072,7 @@ def test_operators_logical(self):
         if self.sfx not in ("u8"):
             return
         data_andc = [a & ~b for a, b in zip(data_cast_a, data_cast_b)]
-        vandc = cast(getattr(self, "andc")(vdata_a, vdata_b))
+        vandc = cast(self.andc(vdata_a, vdata_b))
         assert vandc == data_andc
 
     @pytest.mark.parametrize("intrin", ["any", "all"])

numpy/_core/tests/test_ufunc.py

@@ -27,7 +27,7 @@
 UNARY_OBJECT_UFUNCS = [uf for uf in UNARY_UFUNCS if "O->O" in uf.types]
 
 # Remove functions that do not support `floats`
-UNARY_OBJECT_UFUNCS.remove(getattr(np, 'bitwise_count'))
+UNARY_OBJECT_UFUNCS.remove(np.bitwise_count)
 
 
 class TestUfuncKwargs:

numpy/_core/tests/test_umath_accuracy.py

@@ -13,8 +13,8 @@
 UNARY_OBJECT_UFUNCS = [uf for uf in UNARY_UFUNCS if "O->O" in uf.types]
 
 # Remove functions that do not support `floats`
-UNARY_OBJECT_UFUNCS.remove(getattr(np, 'invert'))
-UNARY_OBJECT_UFUNCS.remove(getattr(np, 'bitwise_count'))
+UNARY_OBJECT_UFUNCS.remove(np.invert)
+UNARY_OBJECT_UFUNCS.remove(np.bitwise_count)
 
 IS_AVX = __cpu_features__.get('AVX512F', False) or \
         (__cpu_features__.get('FMA3', False) and __cpu_features__.get('AVX2', False))

numpy/f2py/f2py2e.py

@@ -547,7 +547,7 @@ def __call__(self, parser, namespace, values, option_string=None):
             include_paths_set.update(values.split(':'))
         else:
             include_paths_set.add(values)
-        setattr(namespace, 'include_paths', list(include_paths_set))
+        namespace.include_paths = list(include_paths_set)
 
 def f2py_parser():
     parser = argparse.ArgumentParser(add_help=False)

numpy/f2py/tests/test_array_from_pyobj.py

@@ -191,12 +191,12 @@ def _init(self, name):
 
         if self.NAME == 'CHARACTER':
             info = c_names_dict[self.NAME]
-            self.type_num = getattr(wrap, 'NPY_STRING')
+            self.type_num = wrap.NPY_STRING
             self.elsize = 1
             self.dtype = np.dtype('c')
         elif self.NAME.startswith('STRING'):
             info = c_names_dict[self.NAME[:6]]
-            self.type_num = getattr(wrap, 'NPY_STRING')
+            self.type_num = wrap.NPY_STRING
             self.elsize = int(self.NAME[6:] or 0)
             self.dtype = np.dtype(f'S{self.elsize}')
         else:

numpy/f2py/tests/test_callback.py

@@ -94,7 +94,7 @@ def callback(code):
             else:
                 return 1
 
-        f = getattr(self.module, "string_callback")
+        f = self.module.string_callback
         r = f(callback)
         assert r == 0
 
@@ -115,7 +115,7 @@ def callback(cu, lencu):
                 return 3
             return 0
 
-        f = getattr(self.module, "string_callback_array")
+        f = self.module.string_callback_array
         for cu in [cu1, cu2, cu3]:
             res = f(callback, cu, cu.size)
             assert res == 0

numpy/f2py/tests/test_docs.py

@@ -34,11 +34,11 @@ class TestDocAdvanced(util.F2PyTest):
                _path('ftype.f')]
 
     def test_asterisk1(self):
-        foo = getattr(self.module, 'foo1')
+        foo = self.module.foo1
         assert_equal(foo(), b'123456789A12')
 
     def test_asterisk2(self):
-        foo = getattr(self.module, 'foo2')
+        foo = self.module.foo2
         assert_equal(foo(2), b'12')
         assert_equal(foo(12), b'123456789A12')
         assert_equal(foo(20), b'123456789A123456789B')

numpy/random/tests/test_extending.py

@@ -83,7 +83,7 @@ def test_cython(tmp_path):
     g = glob.glob(str(target_dir / "*" / "extending.pyx.c"))
     with open(g[0]) as fid:
         txt_to_find = 'NumPy API declarations from "numpy/__init__'
-        for i, line in enumerate(fid):
+        for line in fid:
             if txt_to_find in line:
                 break
         else:

tools/c_coverage/c_coverage_report.py

@@ -122,7 +122,7 @@ def collect_stats(files, fd, pattern):
 
     current_file = None
     current_function = None
-    for i, line in enumerate(fd):
+    for line in fd:
         if re.match("f[lie]=.+", line):
             path = line.split('=', 2)[1].strip()
             if os.path.exists(path) and re.search(pattern, path):