[CodeStyle][3.8] Replace {**A, **B} with A | B (PEP 584) (#72891)

gouzil · SigureMo · web-flow · commit 0a383fce46a4 · 2025-05-24T02:32:48.000+08:00
---------

Co-authored-by: Nyakku Shigure &lt;sigure.qaq@gmail.com&gt;
diff --git a/python/paddle/jit/sot/opcode_translator/executor/variables/base.py b/python/paddle/jit/sot/opcode_translator/executor/variables/base.py
@@ -541,7 +541,7 @@ def setitem(self, key, value):
         raise FallbackError(f"{self} is not support setitem.")
 
     def __repr__(self):
-        info = {**self.main_info, **self.debug_info}
+        info = self.main_info | self.debug_info
         info_str = ", ".join([f"{value}" for value in info.values()])
         return f"{self.__class__.__name__}({info_str})"
 
diff --git a/python/paddle/jit/utils.py b/python/paddle/jit/utils.py
@@ -192,11 +192,6 @@ def __ixor__(self, other: OrderedSet[T]):
             >>> s1
             OrderedSet(1, 4)
         """
-        # TODO(Python3.8-cleanup): Use dict union syntax when Python 3.9 is
-        # minimum supported version.
-        # self._data = {item: None for item in self if item not in other} | {
-        #     item: None for item in other if item not in self
-        # }
         self._data = {
             **{item: None for item in self if item not in other},
             **{item: None for item in other if item not in self},
diff --git a/test/deprecated/legacy_test/auto_parallel_op_test.py b/test/deprecated/legacy_test/auto_parallel_op_test.py
@@ -844,7 +844,7 @@ def get_eager_desire(self, dist_mode=False):
                 xs.append(inputs_dict[self.inputs_to_check])
             vs = self.gen_eager_grad_outputs()
             no_grad_vars = self.gen_no_grad_set(
-                var_dict={**inputs_dict, **outputs_dict}
+                var_dict=inputs_dict | outputs_dict
             )
             grad_res = paddle.grad(
                 ys, xs, vs, allow_unused=True, no_grad_vars=no_grad_vars
diff --git a/test/deprecated/prim/prim/vjp/static/test_comp_multiply_grad_deprecated.py b/test/deprecated/prim/prim/vjp/static/test_comp_multiply_grad_deprecated.py
@@ -96,13 +96,8 @@ def vjp(self):
         exe.run(sp)
         return exe.run(
             program=mp,
-            feed={
-                **{
-                    f'primal{i}': primal
-                    for i, primal in enumerate(self.primals)
-                },
-                **{f'cotangent{i}': co for i, co in enumerate(self.cotangents)},
-            },
+            feed={f'primal{i}': primal for i, primal in enumerate(self.primals)}
+            | {f'cotangent{i}': co for i, co in enumerate(self.cotangents)},
             fetch_list=[g for g in grads if g is not None],
         )
 
diff --git a/test/legacy_test/auto_parallel_op_test.py b/test/legacy_test/auto_parallel_op_test.py
@@ -843,7 +843,7 @@ def get_eager_desire(self, dist_mode=False):
                 xs.append(inputs_dict[self.inputs_to_check])
             vs = self.gen_eager_grad_outputs()
             no_grad_vars = self.gen_no_grad_set(
-                var_dict={**inputs_dict, **outputs_dict}
+                var_dict=inputs_dict | outputs_dict
             )
             grad_res = paddle.grad(
                 ys, xs, vs, allow_unused=True, no_grad_vars=no_grad_vars
diff --git a/test/legacy_test/prim_op_test.py b/test/legacy_test/prim_op_test.py
@@ -1033,7 +1033,7 @@ def get_eager_desire(self):
                 xs.append(inputs_dict[self.inputs_to_check])
             vs = self.gen_eager_grad_outputs()
             no_grad_vars = self.gen_no_grad_set(
-                var_dict={**inputs_dict, **outputs_dict}
+                var_dict=inputs_dict | outputs_dict
             )
             ret = paddle.grad(
                 ys, xs, vs, allow_unused=True, no_grad_vars=no_grad_vars
@@ -1149,7 +1149,7 @@ def check_static_comp(self):
                 vs, vs_feed = self.gen_static_grad_outputs_and_feed()
                 feed.update(vs_feed)
                 no_grad_vars = self.gen_no_grad_set(
-                    var_dict={**inputs_dict, **outputs_dict}
+                    var_dict=inputs_dict | outputs_dict
                 )
                 if not in_pir_mode():
                     ret = paddle.static.gradients(
@@ -1278,7 +1278,7 @@ def check_jit_comp(self):
                 xs.append(inputs_dict[self.inputs_to_check])
             vs = self.gen_eager_grad_outputs()
             no_grad_vars = self.gen_no_grad_set(
-                var_dict={**inputs_dict, **outputs_dict}
+                var_dict=inputs_dict | outputs_dict
             )
             ret = paddle.grad(
                 ys, xs, vs, allow_unused=True, no_grad_vars=no_grad_vars
@@ -1400,7 +1400,7 @@ def check_jit_comp_with_cinn(self):
                 xs.append(inputs_dict[self.inputs_to_check])
             vs = self.gen_eager_grad_outputs()
             no_grad_vars = self.gen_no_grad_set(
-                var_dict={**inputs_dict, **outputs_dict}
+                var_dict=inputs_dict | outputs_dict
             )
             ret = paddle.grad(
                 ys, xs, vs, allow_unused=True, no_grad_vars=no_grad_vars
diff --git a/test/prim/model/test_comp_model_simple_net.py b/test/prim/model/test_comp_model_simple_net.py
@@ -89,13 +89,8 @@ def net(self):
         exe.run(sp)
         return exe.run(
             program=mp,
-            feed={
-                **{
-                    f'primal{i}': primal
-                    for i, primal in enumerate(self.primals)
-                },
-                **{f'cotangent{i}': co for i, co in enumerate(self.cotangents)},
-            },
+            feed={f'primal{i}': primal for i, primal in enumerate(self.primals)}
+            | {f'cotangent{i}': co for i, co in enumerate(self.cotangents)},
             fetch_list=[g for g in grads if g is not None],
         )
 
diff --git a/tools/sampcd_processor.py b/tools/sampcd_processor.py
@@ -377,7 +377,7 @@ def __init__(
         self.target = target
         self.mode = mode
         self.verbose = verbose
-        self.config = {**XDOCTEST_CONFIG, **(config or {})}
+        self.config = XDOCTEST_CONFIG | (config or {})
         self._test_capacity = set()
 
         self._patch_global_state = patch_global_state

Original file line number	Diff line number	Diff line change
`@@ -844,7 +844,7 @@ def get_eager_desire(self, dist_mode=False):`
`844`	`844`	`xs.append(inputs_dict[self.inputs_to_check])`
`845`	`845`	`vs = self.gen_eager_grad_outputs()`
`846`	`846`	`no_grad_vars = self.gen_no_grad_set(`
`847`		`- var_dict={inputs_dict, outputs_dict}`
	`847`	`+ var_dict=inputs_dict \| outputs_dict`
`848`	`848`	`)`
`849`	`849`	`grad_res = paddle.grad(`
`850`	`850`	`ys, xs, vs, allow_unused=True, no_grad_vars=no_grad_vars`
Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,7 @@ def get_eager_desire(self, dist_mode=False):`
`843`	`843`	`xs.append(inputs_dict[self.inputs_to_check])`
`844`	`844`	`vs = self.gen_eager_grad_outputs()`
`845`	`845`	`no_grad_vars = self.gen_no_grad_set(`
`846`		`- var_dict={inputs_dict, outputs_dict}`
	`846`	`+ var_dict=inputs_dict \| outputs_dict`
`847`	`847`	`)`
`848`	`848`	`grad_res = paddle.grad(`
`849`	`849`	`ys, xs, vs, allow_unused=True, no_grad_vars=no_grad_vars`