Merge pull request numpy#26902 from DimitriPapadopoulos/B

Apply some ruff/flake8-bugbear rules (B004 and B005)

Author: charris

numpy/f2py/crackfortran.py

@@ -2539,7 +2539,7 @@ def get_parameters(vars, global_params={}):
                 outmess(f'get_parameters[TODO]: '
                         f'implement evaluation of complex expression {v}\n')
 
-            dimspec = ([s.lstrip('dimension').strip()
+            dimspec = ([s.removeprefix('dimension').strip()
                         for s in vars[n]['attrspec']
                        if s.startswith('dimension')] or [None])[0]
 

numpy/lib/_datasource.py

@@ -420,7 +420,7 @@ def _sanitize_relative_path(self, path):
             last = path
             # Note: os.path.join treats '/' as os.sep on Windows
             path = path.lstrip(os.sep).lstrip('/')
-            path = path.lstrip(os.pardir).lstrip('..')
+            path = path.lstrip(os.pardir).removeprefix('..')
             drive, path = os.path.splitdrive(path)  # for Windows
         return path
 

numpy/lib/_iotools.py

@@ -561,7 +561,7 @@ def upgrade_mapper(cls, func, default=None):
         >>> StringConverter.upgrade_mapper(dateparser, default=defaultdate)
         """
         # Func is a single functions
-        if hasattr(func, '__call__'):
+        if callable(func):
             cls._mapper.insert(-1, (cls._getsubdtype(default), func, default))
             return
         elif hasattr(func, '__iter__'):
@@ -608,7 +608,7 @@ def __init__(self, dtype_or_func=None, default=None, missing_values=None,
                 dtype = np.dtype(dtype_or_func)
             except TypeError:
                 # dtype_or_func must be a function, then
-                if not hasattr(dtype_or_func, '__call__'):
+                if not callable(dtype_or_func):
                     errmsg = ("The input argument `dtype` is neither a"
                               " function nor a dtype (got '%s' instead)")
                     raise TypeError(errmsg % type(dtype_or_func))

numpy/lib/tests/test_loadtxt.py

@@ -1004,7 +1004,7 @@ def test_str_dtype_unit_discovery_with_converter():
     expected = np.array(
         ["spam-a-lot"] * 60000 + ["tis_but_a_scratch"], dtype="U17"
     )
-    conv = lambda s: s.strip("XXX")
+    conv = lambda s: s.removeprefix("XXX")
 
     # file-like path
     txt = StringIO("\n".join(data))