From 599e9e48257c42240f5f6458ac97e264d9110b7e Mon Sep 17 00:00:00 2001 From: zhangchunle Date: Mon, 7 Jun 2021 16:08:00 +0800 Subject: [PATCH] fix too-many-format-args (#33353) --- .../inference/tests/api/full_ILSVRC2012_val_preprocess.py | 4 ++-- .../paddle/distributed/fleet/base/distributed_strategy.py | 2 +- python/paddle/distributed/fleet/launch_utils.py | 2 +- .../distributed/fleet/meta_optimizers/sharding/utils.py | 3 ++- python/paddle/distributed/fleet/utils/fs.py | 3 +-- python/paddle/distributed/utils.py | 2 +- python/paddle/fluid/framework.py | 6 +++--- python/paddle/fluid/incubate/fleet/utils/hdfs.py | 3 +-- python/paddle/fluid/tests/test_beam_search_decoder.py | 2 +- .../fluid/tests/unittests/test_traced_layer_err_msg.py | 2 +- python/paddle/vision/transforms/functional_cv2.py | 3 ++- python/paddle/vision/transforms/functional_pil.py | 3 ++- 12 files changed, 18 insertions(+), 17 deletions(-) diff --git a/paddle/fluid/inference/tests/api/full_ILSVRC2012_val_preprocess.py b/paddle/fluid/inference/tests/api/full_ILSVRC2012_val_preprocess.py index e911c942087..ad72a89eca9 100644 --- a/paddle/fluid/inference/tests/api/full_ILSVRC2012_val_preprocess.py +++ b/paddle/fluid/inference/tests/api/full_ILSVRC2012_val_preprocess.py @@ -167,8 +167,8 @@ def run_convert(): os.path.getsize(output_file) == FULL_SIZE_BYTES): if os.path.exists(output_file): sys.stderr.write( - "\n\nThe existing binary file is broken. Start to generate new one...\n\n". - format(output_file)) + "\n\nThe existing binary file is broken. Start to generate new one...\n\n" + ) os.remove(output_file) if retry < try_limit: retry = retry + 1 diff --git a/python/paddle/distributed/fleet/base/distributed_strategy.py b/python/paddle/distributed/fleet/base/distributed_strategy.py index 0a989fe90f9..2dbf9dd1d71 100644 --- a/python/paddle/distributed/fleet/base/distributed_strategy.py +++ b/python/paddle/distributed/fleet/base/distributed_strategy.py @@ -286,7 +286,7 @@ class DistributedStrategy(object): self.a_sync_configs = {"k_steps": 0} else: raise ValueError( - "The type of `flag` is invalid, expected type is bool, but received %s". + "The type of `flag` is invalid, expected type is bool, but received {}". format(type(flag))) @property diff --git a/python/paddle/distributed/fleet/launch_utils.py b/python/paddle/distributed/fleet/launch_utils.py index c69b21538b6..6f1bc10b1a7 100644 --- a/python/paddle/distributed/fleet/launch_utils.py +++ b/python/paddle/distributed/fleet/launch_utils.py @@ -195,7 +195,7 @@ class Pod(object): self.id != pod.id or \ self.addr != pod.addr or \ self.port != pod.port: - logger.debug("pod {} != pod".format(self, pod)) + logger.debug("pod {} != {}".format(self, pod)) return False if len(self.trainers) != len(pod.trainers): diff --git a/python/paddle/distributed/fleet/meta_optimizers/sharding/utils.py b/python/paddle/distributed/fleet/meta_optimizers/sharding/utils.py index 285647352df..85f114d7f71 100755 --- a/python/paddle/distributed/fleet/meta_optimizers/sharding/utils.py +++ b/python/paddle/distributed/fleet/meta_optimizers/sharding/utils.py @@ -368,7 +368,8 @@ def insert_reduce_ops(block, for var in reduce_vars: root_id = get_grad_device(var, shard) - assert root_id >= 0, "root id should be a positive int".format(var) + assert root_id >= 0, "root id should be a positive int, but now root id is {}".format( + root_id) block._insert_op_without_sync( insert_idx, type='c_reduce_sum', diff --git a/python/paddle/distributed/fleet/utils/fs.py b/python/paddle/distributed/fleet/utils/fs.py index 087942e70a2..f9cedba7773 100644 --- a/python/paddle/distributed/fleet/utils/fs.py +++ b/python/paddle/distributed/fleet/utils/fs.py @@ -841,8 +841,7 @@ class HDFSClient(FS): fs_src_path)) if self.is_exist(fs_dst_path): - raise FSFileExistsError("{} exists already".format( - fs_src_path, fs_dst_path, fs_dst_path)) + raise FSFileExistsError("{} exists already".format(fs_dst_path)) return self._try_mv(fs_src_path, fs_dst_path) diff --git a/python/paddle/distributed/utils.py b/python/paddle/distributed/utils.py index e84025c2eb6..7fb55239c03 100644 --- a/python/paddle/distributed/utils.py +++ b/python/paddle/distributed/utils.py @@ -264,7 +264,7 @@ class Pod(object): self.id != pod.id or \ self.addr != pod.addr or \ self.port != pod.port: - logger.debug("pod {} != pod".format(self, pod)) + logger.debug("pod {} != {}".format(self, pod)) return False if len(self.trainers) != len(pod.trainers): diff --git a/python/paddle/fluid/framework.py b/python/paddle/fluid/framework.py index bffeaf2c6c9..54e4e6f1391 100644 --- a/python/paddle/fluid/framework.py +++ b/python/paddle/fluid/framework.py @@ -2142,7 +2142,7 @@ class Operator(object): """ assert isinstance( skip_op_callstack, bool - ), "skip_op_callstack parameter's type is error, expect bool, received %s".format( + ), "skip_op_callstack parameter's type is error, expect bool, received {}".format( type(skip_op_callstack)) outputs_str = "{" for i in range(0, len(self.output_names)): @@ -2550,7 +2550,7 @@ class Block(object): """ assert isinstance( skip_op_callstack, bool - ), "skip_op_callstack parameter's type is error, expect bool, received %s".format( + ), "skip_op_callstack parameter's type is error, expect bool, received {}".format( type(skip_op_callstack)) block_str = "{ // block " block_str += "{}\n".format(self.idx) @@ -4259,7 +4259,7 @@ class Program(object): """ assert isinstance( skip_op_callstack, bool - ), "skip_op_callstack parameter's type is error, expect bool, received %s".format( + ), "skip_op_callstack parameter's type is error, expect bool, received {}".format( type(skip_op_callstack)) program_str = "" for block in self.blocks: diff --git a/python/paddle/fluid/incubate/fleet/utils/hdfs.py b/python/paddle/fluid/incubate/fleet/utils/hdfs.py index 94a371ae3fb..fe09692531a 100644 --- a/python/paddle/fluid/incubate/fleet/utils/hdfs.py +++ b/python/paddle/fluid/incubate/fleet/utils/hdfs.py @@ -268,8 +268,7 @@ class HDFSClient(FS): fs_src_path)) if self.is_exist(fs_dst_path): - raise FSFileExistsError("{} exists already".format( - fs_src_path, fs_dst_path, fs_dst_path)) + raise FSFileExistsError("{} exists already".format(fs_dst_path)) return self._try_mv(fs_src_path, fs_dst_path) diff --git a/python/paddle/fluid/tests/test_beam_search_decoder.py b/python/paddle/fluid/tests/test_beam_search_decoder.py index 69f3ff46b3a..301bd0ff003 100644 --- a/python/paddle/fluid/tests/test_beam_search_decoder.py +++ b/python/paddle/fluid/tests/test_beam_search_decoder.py @@ -246,7 +246,7 @@ def inject_test_train(use_cuda): def inject_test_decode(use_cuda, decorator=None): - f_name = 'test_{0}_decode'.format('cuda' if use_cuda else 'cpu', 'sparse') + f_name = 'test_{0}_decode'.format('cuda' if use_cuda else 'cpu') def f(*args): with scope_prog_guard(): diff --git a/python/paddle/fluid/tests/unittests/test_traced_layer_err_msg.py b/python/paddle/fluid/tests/unittests/test_traced_layer_err_msg.py index cb518646889..85d830485e2 100644 --- a/python/paddle/fluid/tests/unittests/test_traced_layer_err_msg.py +++ b/python/paddle/fluid/tests/unittests/test_traced_layer_err_msg.py @@ -72,7 +72,7 @@ class TestTracedLayerErrMsg(unittest.TestCase): self.layer, 3) self.assertEqual( "The type of 'each element of inputs' in fluid.dygraph.jit.TracedLayer.trace must be fluid.Variable, but received <{} 'int'>.". - format(self.type_str, self.type_str), str(e.exception)) + format(self.type_str), str(e.exception)) with self.assertRaises(TypeError) as e: dygraph_out, traced_layer = fluid.dygraph.TracedLayer.trace( self.layer, [True, 1]) diff --git a/python/paddle/vision/transforms/functional_cv2.py b/python/paddle/vision/transforms/functional_cv2.py index 99cbfd6dc4f..8ebe542c645 100644 --- a/python/paddle/vision/transforms/functional_cv2.py +++ b/python/paddle/vision/transforms/functional_cv2.py @@ -392,7 +392,8 @@ def adjust_hue(img, hue_factor): cv2 = try_import('cv2') if not (-0.5 <= hue_factor <= 0.5): - raise ValueError('hue_factor is not in [-0.5, 0.5].'.format(hue_factor)) + raise ValueError('hue_factor:{} is not in [-0.5, 0.5].'.format( + hue_factor)) dtype = img.dtype img = img.astype(np.uint8) diff --git a/python/paddle/vision/transforms/functional_pil.py b/python/paddle/vision/transforms/functional_pil.py index eee60c5452b..d94309bcb88 100644 --- a/python/paddle/vision/transforms/functional_pil.py +++ b/python/paddle/vision/transforms/functional_pil.py @@ -378,7 +378,8 @@ def adjust_hue(img, hue_factor): """ if not (-0.5 <= hue_factor <= 0.5): - raise ValueError('hue_factor is not in [-0.5, 0.5].'.format(hue_factor)) + raise ValueError('hue_factor:{} is not in [-0.5, 0.5].'.format( + hue_factor)) input_mode = img.mode if input_mode in {'L', '1', 'I', 'F'}: -- GitLab