From: Berker Peksag <berker.peksag@gmail.com>
Date: Sun, 6 Mar 2016 14:50:15 +0000 (+0200)
Subject: Issue #26489: Add dictionary unpacking support to Tools/parser/unparse.py
X-Git-Tag: v3.6.0a1~522^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d66dd5ce68cbf4a33c385439d5eeb2bff4e860f1;p=thirdparty%2FPython%2Fcpython.git

Issue #26489: Add dictionary unpacking support to Tools/parser/unparse.py

Patch by Guo Ci Teo.
---

diff --git a/Lib/test/test_tools/test_unparse.py b/Lib/test/test_tools/test_unparse.py
index 976a6c59ae10..734bbc215ad2 100644
--- a/Lib/test/test_tools/test_unparse.py
+++ b/Lib/test/test_tools/test_unparse.py
@@ -250,6 +250,11 @@ class UnparseTestCase(ASTTestCase):
     def test_with_two_items(self):
         self.check_roundtrip(with_two_items)
 
+    def test_dict_unpacking_in_dict(self):
+        # See issue 26489
+        self.check_roundtrip(r"""{**{'y': 2}, 'x': 1}""")
+        self.check_roundtrip(r"""{**{'y': 2}, **{'x': 1}}""")
+
 
 class DirectoryTestCase(ASTTestCase):
     """Test roundtrip behaviour on all files in Lib and Lib/test."""
diff --git a/Misc/NEWS b/Misc/NEWS
index 9a775ac527cd..81c7dc8c6dee 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -328,6 +328,9 @@ Windows
 Tools/Demos
 -----------
 
+- Issue #26489: Add dictionary unpacking support to Tools/parser/unparse.py.
+  Patch by Guo Ci Teo.
+
 - Issue #26316: Fix variable name typo in Argument Clinic.
 
 
diff --git a/Tools/parser/unparse.py b/Tools/parser/unparse.py
index c82857710b06..285030e792f4 100644
--- a/Tools/parser/unparse.py
+++ b/Tools/parser/unparse.py
@@ -393,12 +393,21 @@ class Unparser:
 
     def _Dict(self, t):
         self.write("{")
-        def write_pair(pair):
-            (k, v) = pair
+        def write_key_value_pair(k, v):
             self.dispatch(k)
             self.write(": ")
             self.dispatch(v)
-        interleave(lambda: self.write(", "), write_pair, zip(t.keys, t.values))
+
+        def write_item(item):
+            k, v = item
+            if k is None:
+                # for dictionary unpacking operator in dicts {**{'y': 2}}
+                # see PEP 448 for details
+                self.write("**")
+                self.dispatch(v)
+            else:
+                write_key_value_pair(k, v)
+        interleave(lambda: self.write(", "), write_item, zip(t.keys, t.values))
         self.write("}")
 
     def _Tuple(self, t):