fixup b005 errors

Author: MarcoGorelli

doc/source/conf.py

@@ -583,7 +583,9 @@ class AccessorCallableDocumenter(AccessorLevelDocumenter, MethodDocumenter):
     priority = 0.5
 
     def format_name(self):
-        return MethodDocumenter.format_name(self).rstrip(".__call__")
+        return pandas.util._str_methods.removesuffix(
+            MethodDocumenter.format_name(self), ".__call__"
+        )
 
 
 class PandasAutosummary(Autosummary):

pandas/core/ops/common.py

@@ -9,6 +9,10 @@
 from pandas._libs.lib import item_from_zerodim
 from pandas._libs.missing import is_matching_na
 from pandas._typing import F
+from pandas.util._str_methods import (
+    removeprefix,
+    removesuffix,
+)
 
 from pandas.core.dtypes.generic import (
     ABCDataFrame,
@@ -52,7 +56,8 @@ def _unpack_zerodim_and_defer(method, name: str):
     -------
     method
     """
-    is_cmp = name.strip("__") in {"eq", "ne", "lt", "le", "gt", "ge"}
+    stripped_name = removesuffix(removeprefix(name, "__"), "__")
+    is_cmp = stripped_name in {"eq", "ne", "lt", "le", "gt", "ge"}
 
     @wraps(method)
     def new_method(self, other):

pandas/tests/io/test_sql.py

@@ -1587,7 +1587,7 @@ def test_get_schema2(self, test_frame1):
     def _get_sqlite_column_type(self, schema, column):
 
         for col in schema.split("\n"):
-            if col.split()[0].strip('""') == column:
+            if col.split()[0].strip('"') == column:
                 return col.split()[1]
         raise ValueError(f"Column {column} not found")
 

pandas/tests/util/test_str_methods.py

@@ -0,0 +1,41 @@
+import pytest
+
+from pandas.util._str_methods import (
+    removeprefix,
+    removesuffix,
+)
+
+
+@pytest.mark.parametrize(
+    "string, prefix, expected",
+    (
+        ("wildcat", "wild", "cat"),
+        ("blackbird", "black", "bird"),
+        ("housefly", "house", "fly"),
+        ("ladybug", "lady", "bug"),
+        ("rattlesnake", "rattle", "snake"),
+        ("baboon", "badger", "baboon"),
+        ("quetzal", "elk", "quetzal"),
+    ),
+)
+def test_remove_prefix(string, prefix, expected):
+    result = removeprefix(string, prefix)
+    assert result == expected
+
+
+@pytest.mark.parametrize(
+    "string, suffix, expected",
+    (
+        ("wildcat", "cat", "wild"),
+        ("blackbird", "bird", "black"),
+        ("housefly", "fly", "house"),
+        ("ladybug", "bug", "lady"),
+        ("rattlesnake", "snake", "rattle"),
+        ("seahorse", "horse", "sea"),
+        ("baboon", "badger", "baboon"),
+        ("quetzal", "elk", "quetzal"),
+    ),
+)
+def test_remove_suffix(string, suffix, expected):
+    result = removesuffix(string, suffix)
+    assert result == expected

pandas/util/_str_methods.py

@@ -0,0 +1,18 @@
+"""
+Python3.9 introduces removesuffix and remove prefix.
+
+They're reimplemented here for use in Python3.8.
+"""
+from __future__ import annotations
+
+
+def removesuffix(string: str, suffix: str) -> str:
+    if string.endswith(suffix):
+        return string[: -len(suffix)]
+    return string
+
+
+def removeprefix(string: str, prefix: str) -> str:
+    if string.startswith(prefix):
+        return string[len(prefix) :]
+    return string

setup.cfg

@@ -192,8 +192,6 @@ ignore =
     # found modulo formatter (incorrect picks up mod operations)
     S001,
     # controversial
-    B005,
-    # controversial
     B006,
     # controversial
     B007,