From d5777a241d04f6dcd636d5a432ce3a2271b61219 Mon Sep 17 00:00:00 2001
From: gouzi <530971494@qq.com>
Date: Fri, 24 Mar 2023 23:37:02 +0800
Subject: [PATCH 1/4] [CodeStyle][PLC3002] simplify Lambda

---
 pyproject.toml                                       |  3 +++
 .../tests/unittests/dygraph_to_static/test_lambda.py | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 90c77878cd526..f65cfbe264c7b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -115,6 +115,9 @@ select = [
     # "B030",
     "B032",
     # "B904",
+
+    # Pylint
+    "PLC3002",
 ]
 unfixable = [
     "NPY001"
diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_lambda.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_lambda.py
index 61ef6bb7a16ba..ea52af35247b9 100644
--- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_lambda.py
+++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_lambda.py
@@ -37,8 +37,8 @@ def call_lambda_as_func(x):
 def call_lambda_directly(x):
     x = fluid.dygraph.to_variable(x)
 
-    y = (lambda x, y: x + y)(x, x)
-    out = (lambda x: paddle.mean(x))(y)
+    y = x + x
+    out = paddle.mean(y)
 
     return out
 
@@ -48,8 +48,8 @@ def call_lambda_in_func(x):
 
     add_func = lambda x: x + 1
 
-    y = paddle.mean((lambda x: F.relu(x))(x))
-    out = add_func(y) if y > 1 and y < 2 else (lambda x: x**2)(y)
+    y = paddle.mean((F.relu(x)))
+    out = add_func(y) if y > 1 and y < 2 else y**2
 
     return out
 
@@ -60,7 +60,7 @@ def call_lambda_with_ifExpr(x):
     add_func = lambda x: x + 1
 
     y = paddle.mean(x)
-    out = add_func(y) if y or y < 2 else (lambda x: x**2)(y)
+    out = add_func(y) if y or y < 2 else y**2
 
     return out
 
@@ -74,7 +74,7 @@ def call_lambda_with_ifExpr2(x):
 
     # NOTE: y is Variable, but z<2 is python bool value
     z = 0
-    out = add_func(y) if y or z < 2 else (lambda x: x**2)(y)
+    out = add_func(y) if y or z < 2 else y**2
 
     return out
 

From 7d5f55b3da4f9d3522f0a2f726e52fadf4809295 Mon Sep 17 00:00:00 2001
From: gouzi <530971494@qq.com>
Date: Fri, 24 Mar 2023 23:51:23 +0800
Subject: [PATCH 2/4] [CodeStyle][PLE1205] Optimize log output

---
 pyproject.toml                                               | 1 +
 python/paddle/distributed/fleet/base/distributed_strategy.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f65cfbe264c7b..68603b93d87af 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -118,6 +118,7 @@ select = [
 
     # Pylint
     "PLC3002",
+    "PLE1205"
 ]
 unfixable = [
     "NPY001"
diff --git a/python/paddle/distributed/fleet/base/distributed_strategy.py b/python/paddle/distributed/fleet/base/distributed_strategy.py
index 57e4378041eae..5db0f3f5e67d1 100755
--- a/python/paddle/distributed/fleet/base/distributed_strategy.py
+++ b/python/paddle/distributed/fleet/base/distributed_strategy.py
@@ -543,7 +543,7 @@ def set_table_config(msg, config_name, configs, index=0):
                             getattr(msg, field.name), name, configs
                         )
                 else:
-                    logger.debug("not message:", name)
+                    logger.debug("not message: %s", name)
                     if name not in configs:
                         continue
                     if field.label == FieldDescriptor.LABEL_REPEATED:

From d0120e624ee84266c39b1a2bafc206ed18b6ad9e Mon Sep 17 00:00:00 2001
From: gouzi <530971494@qq.com>
Date: Sat, 25 Mar 2023 13:43:28 +0800
Subject: [PATCH 3/4] RollBACK

---
 pyproject.toml                                       |  1 +
 .../tests/unittests/dygraph_to_static/test_lambda.py | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 68603b93d87af..9394975492ff9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -127,3 +127,4 @@ unfixable = [
 [tool.ruff.per-file-ignores]
 "__init__.py" = ["F401"]
 "setup.py" = ["UP036"]
+"python/paddle/fluid/tests/unittests/dygraph_to_static/test_lambda.py" = ["PLC3002"]
diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_lambda.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_lambda.py
index ea52af35247b9..61ef6bb7a16ba 100644
--- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_lambda.py
+++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_lambda.py
@@ -37,8 +37,8 @@ def call_lambda_as_func(x):
 def call_lambda_directly(x):
     x = fluid.dygraph.to_variable(x)
 
-    y = x + x
-    out = paddle.mean(y)
+    y = (lambda x, y: x + y)(x, x)
+    out = (lambda x: paddle.mean(x))(y)
 
     return out
 
@@ -48,8 +48,8 @@ def call_lambda_in_func(x):
 
     add_func = lambda x: x + 1
 
-    y = paddle.mean((F.relu(x)))
-    out = add_func(y) if y > 1 and y < 2 else y**2
+    y = paddle.mean((lambda x: F.relu(x))(x))
+    out = add_func(y) if y > 1 and y < 2 else (lambda x: x**2)(y)
 
     return out
 
@@ -60,7 +60,7 @@ def call_lambda_with_ifExpr(x):
     add_func = lambda x: x + 1
 
     y = paddle.mean(x)
-    out = add_func(y) if y or y < 2 else y**2
+    out = add_func(y) if y or y < 2 else (lambda x: x**2)(y)
 
     return out
 
@@ -74,7 +74,7 @@ def call_lambda_with_ifExpr2(x):
 
     # NOTE: y is Variable, but z<2 is python bool value
     z = 0
-    out = add_func(y) if y or z < 2 else y**2
+    out = add_func(y) if y or z < 2 else (lambda x: x**2)(y)
 
     return out
 

From 723b0f7e2fdd1994c7e58497003e3a912860651f Mon Sep 17 00:00:00 2001
From: gouzi <530971494@qq.com>
Date: Sat, 25 Mar 2023 15:56:55 +0800
Subject: [PATCH 4/4] [CodeStyle][PLC3002][PLE1205] fix pyproject.toml

---
 pyproject.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 22f7958859c42..d59e3294b2e08 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -118,9 +118,8 @@ select = [
 
     # Pylint
     "PLC3002",
-    "PLE1205"
+    "PLE1205",
     "PLR0402",
-
 ]
 unfixable = [
     "NPY001"