changeset:   96823:a4df0fe62b46
branch:      3.5
user:        Benjamin Peterson <benjamin@python.org>
date:        Sun Jul 05 10:37:25 2015 -0500
files:       Lib/test/test_unpack_ex.py Misc/NEWS Python/ceval.c
description:
set items in dict displays from left to right (closes #24569)


diff -r 9e428956245a -r a4df0fe62b46 Lib/test/test_unpack_ex.py
--- a/Lib/test/test_unpack_ex.py	Sun Jul 05 10:37:00 2015 -0500
+++ b/Lib/test/test_unpack_ex.py	Sun Jul 05 10:37:25 2015 -0500
@@ -128,6 +128,9 @@
     ...                          for i in range(1000)) + "}"))
     1000
 
+    >>> {0:1, **{0:2}, 0:3, 0:4}
+    {0: 4}
+
 List comprehension element unpacking
 
     >>> a, b, c = [0, 1, 2], 3, 4
diff -r 9e428956245a -r a4df0fe62b46 Misc/NEWS
--- a/Misc/NEWS	Sun Jul 05 10:37:00 2015 -0500
+++ b/Misc/NEWS	Sun Jul 05 10:37:25 2015 -0500
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #24569: Make PEP 448 dictionary evaluation more consistent.
+
 Library
 -------
 
diff -r 9e428956245a -r a4df0fe62b46 Python/ceval.c
--- a/Python/ceval.c	Sun Jul 05 10:37:00 2015 -0500
+++ b/Python/ceval.c	Sun Jul 05 10:37:25 2015 -0500
@@ -2561,22 +2561,25 @@
         }
 
         TARGET(BUILD_MAP) {
+            int i;
             PyObject *map = _PyDict_NewPresized((Py_ssize_t)oparg);
             if (map == NULL)
                 goto error;
-            while (--oparg >= 0) {
+            for (i = oparg; i > 0; i--) {
                 int err;
-                PyObject *value = TOP();
-                PyObject *key = SECOND();
-                STACKADJ(-2);
+                PyObject *key = PEEK(2*i);
+                PyObject *value = PEEK(2*i - 1);
                 err = PyDict_SetItem(map, key, value);
-                Py_DECREF(value);
-                Py_DECREF(key);
                 if (err != 0) {
                     Py_DECREF(map);
                     goto error;
                 }
             }
+
+            while (oparg--) {
+                Py_DECREF(POP());
+                Py_DECREF(POP());
+            }
             PUSH(map);
             DISPATCH();
         }