[CodeStyle][Ruff] Introduce rule B005 and fix discovered bugs (#72896)

gouzil · web-flow · commit 5d76b0280e69 · 2025-05-23T10:25:53.000+08:00
diff --git a/ci/coverage_diff.py b/ci/coverage_diff.py
@@ -40,7 +40,7 @@ def get_diff_file_lines(diff_file):
             line = line.strip()
 
             if line.startswith('+++ '):
-                current_file = line.lstrip('+++ ')
+                current_file = line.removeprefix('+++ ')
 
                 diff_file_lines[current_file] = []
 
diff --git a/paddle/fluid/eager/auto_code_generator/generator/python_c_gen.py b/paddle/fluid/eager/auto_code_generator/generator/python_c_gen.py
@@ -534,7 +534,7 @@ def GeneratePythonCFunction(self):
         )
 
         # Set prefix of forward_api_name to avoid conflicts
-        prefix = self.namespace.strip("::")
+        prefix = self.namespace.removeprefix("::").removesuffix("::")
         forward_api_name_prefix = "" if prefix == "" else prefix + "_"
 
         # Generate Python-C Function Registration
diff --git a/pyproject.toml b/pyproject.toml
@@ -55,6 +55,7 @@ select = [
     "B002",
     "B003",
     "B004",
+    "B005",
     "B009",
     "B010",
     "B011",
diff --git a/python/paddle/distributed/fleet/meta_optimizers/sharding/fp16_helper.py b/python/paddle/distributed/fleet/meta_optimizers/sharding/fp16_helper.py
@@ -96,10 +96,8 @@ def prune_fp16(block, shard, reduced_grads_to_param, ring_ids):
                 continue
             output_name = op.desc.output_arg_names()[0]
             # TODO (JZ-LIANG) revise this for uniform mixed parallelism
-            param_name = (
-                output_name.strip("@GRAD@MERGED")
-                if "@MERGED" in output_name
-                else output_name.strip("@GRAD")
+            param_name = output_name.removesuffix("@MERGED").removesuffix(
+                "@GRAD"
             )
             if param_name not in shard.global_params:
                 raise ValueError(
@@ -125,10 +123,9 @@ def prune_fp16(block, shard, reduced_grads_to_param, ring_ids):
                 reversed_x_paramname = []
                 for input_name in op.desc.input('X'):
                     # TODO (JZ-LIANG) revise this for uniform mixed parallelism
-                    if "@MERGED" in input_name:
-                        param_name = input_name.strip("@GRAD@MERGED")
-                    else:
-                        param_name = input_name.strip("@GRAD")
+                    param_name = input_name.removesuffix(
+                        "@MERGED"
+                    ).removesuffix("@GRAD")
                     if param_name not in shard.global_params:
                         raise ValueError(
                             "Input 'X' of check_finite_and_unscale must"
diff --git a/python/paddle/distributed/fleet/meta_optimizers/sharding/gradient_clip_helper.py b/python/paddle/distributed/fleet/meta_optimizers/sharding/gradient_clip_helper.py
@@ -48,10 +48,9 @@ def prune_gradient_clip(self, block, shard, ring_ids):
                 if input_name in deprecated_vars:
                     deprecate_op = True
                 # TODO (JZ-LIANG) revise this for uniform mixed parallelism
-                if "@MERGED" in input_name:
-                    param_name = input_name.strip("@GRAD@MERGED")
-                else:
-                    param_name = input_name.strip("@GRAD")
+                param_name = input_name.removesuffix("@MERGED").removesuffix(
+                    "@GRAD"
+                )
                 if shard.is_param(param_name) and not shard.has_param(
                     param_name
                 ):
diff --git a/python/paddle/distributed/launch/controllers/master.py b/python/paddle/distributed/launch/controllers/master.py
@@ -189,7 +189,7 @@ def __init__(self, ctx):
 
         if self.ctx.args.master:
             # etcd://localhost:2379
-            self.endpoint = self.ctx.args.master.strip("etcd://")
+            self.endpoint = self.ctx.args.master.removeprefix("etcd://")
 
         import etcd3
 
diff --git a/python/paddle/distributed/launch/main.py b/python/paddle/distributed/launch/main.py
@@ -391,8 +391,8 @@ def launch() -> None:
         if nnodes > 1:
             from paddle.distributed.launch.utils.etcd_client import ETCDClient
 
-            assert "etcd://" in ctx.args.master
-            master_ip, port = ctx.args.master.strip("etcd://").split(':')
+            assert ctx.args.master.startswith("etcd://")
+            master_ip, port = ctx.args.master.removeprefix("etcd://").split(':')
             client = ETCDClient(host=master_ip, port=port)
             client.delete("best_cfg")
             client.delete_prefix("auto_tuner")
diff --git a/tools/check_api_yaml_same.py b/tools/check_api_yaml_same.py
@@ -233,7 +233,7 @@ def get_yaml_diff(branch):
         # if op args in yaml is modified and this args is in API,
         # this PR need to be reviewed.
         if each_diff.startswith('-  args'):
-            yaml_op_args_str = each_diff.strip('-  args : ')
+            yaml_op_args_str = each_diff.removeprefix('-  args : ')
             yaml_op_args = get_yaml_op_args(yaml_op_args_str)
             for api in pr_apis:
                 if get_api_args(api) == yaml_op_args:
diff --git a/tools/coverage/coverage_diff.py b/tools/coverage/coverage_diff.py
@@ -38,7 +38,7 @@ def get_diff_file_lines(diff_file):
             line = line.strip()
 
             if line.startswith('+++ '):
-                current_file = line.lstrip('+++ ')
+                current_file = line.removeprefix('+++ ')
 
                 diff_file_lines[current_file] = []
 

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ def GeneratePythonCFunction(self):`
`534`	`534`	`)`
`535`	`535`
`536`	`536`	`# Set prefix of forward_api_name to avoid conflicts`
`537`		`- prefix = self.namespace.strip("::")`
	`537`	`+ prefix = self.namespace.removeprefix("::").removesuffix("::")`
`538`	`538`	`forward_api_name_prefix = "" if prefix == "" else prefix + "_"`
`539`	`539`
`540`	`540`	`# Generate Python-C Function Registration`
-Original file line number
+Diff line change
     "B002",
     "B003",
     "B004",
 +    "B005",
     "B009",
     "B010",
     "B011",