in dict displays, evaluate the key before the value (closes #11205)

benjaminp · benjaminp · commit ee85339cc69a · 2015-05-28T14:30:26.000-05:00
Patch partially by Steve Dougherty.
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
@@ -221,12 +221,13 @@ def _write_atomic(path, data, mode=0o666):
 #     Python 3.4rc2 3310 (alter __qualname__ computation)
 #     Python 3.5a0  3320 (matrix multiplication operator)
 #     Python 3.5b1  3330 (PEP 448: Additional Unpacking Generalizations)
+#     Python 3.5b2  3340 (fix dictionary display evaluation order #11205)
 #
 # MAGIC must change whenever the bytecode emitted by the compiler may no
 # longer be understood by older implementations of the eval loop (usually
 # due to the addition of new opcodes).
 
-MAGIC_NUMBER = (3330).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3340).to_bytes(2, 'little') + b'\r\n'
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c
 
 _PYCACHE = '__pycache__'
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
@@ -461,6 +461,17 @@ def test_compile_ast(self):
         ast.body = [_ast.BoolOp()]
         self.assertRaises(TypeError, compile, ast, '<ast>', 'exec')
 
+    def test_dict_evaluation_order(self):
+        i = 0
+
+        def f():
+            nonlocal i
+            i += 1
+            return i
+
+        d = {f(): f(), f(): f()}
+        self.assertEqual(d, {1: 2, 3: 4})
+
     @support.cpython_only
     def test_same_filename_used(self):
         s = """def f(): pass\ndef g(): pass"""
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,8 @@ Release date: 2015-07-05
 Core and Builtins
 -----------------
 
+- Issue #11205: In dictionary displays, evaluate the key before the value.
+
 - Issue #24285: Fixed regression that prevented importing extension modules
   from inside packages. Patch by Petr Viktorin.
 
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -2584,8 +2584,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
                 goto error;
             while (--oparg >= 0) {
                 int err;
-                PyObject *key = TOP();
-                PyObject *value = SECOND();
+                PyObject *value = TOP();
+                PyObject *key = SECOND();
                 STACKADJ(-2);
                 err = PyDict_SetItem(map, key, value);
                 Py_DECREF(value);
diff --git a/Python/compile.c b/Python/compile.c
@@ -3138,8 +3138,8 @@ compiler_dict(struct compiler *c, expr_ty e)
             containers++;
         }
         else {
-            VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.values, i));
             VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.keys, i));
+            VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.values, i));
             elements++;
         }
     }
@@ -3287,8 +3287,8 @@ compiler_call_helper(struct compiler *c,
         }
         else if (nsubkwargs) {
             /* A keyword argument and we already have a dict. */
-            VISIT(c, expr, kw->value);
             ADDOP_O(c, LOAD_CONST, kw->arg, consts);
+            VISIT(c, expr, kw->value);
             nseen++;
         }
         else {
diff --git a/Python/importlib_external.h b/Python/importlib_external.h

Original file line number	Diff line number	Diff line change
`@@ -3138,8 +3138,8 @@ compiler_dict(struct compiler *c, expr_ty e)`
`3138`	`3138`	`containers++;`
`3139`	`3139`	`}`
`3140`	`3140`	`else {`
`3141`		`- VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.values, i));`
`3142`	`3141`	`VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.keys, i));`
	`3142`	`+ VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.values, i));`
`3143`	`3143`	`elements++;`
`3144`	`3144`	`}`
`3145`	`3145`	`}`
`@@ -3287,8 +3287,8 @@ compiler_call_helper(struct compiler *c,`
`3287`	`3287`	`}`
`3288`	`3288`	`else if (nsubkwargs) {`
`3289`	`3289`	`/* A keyword argument and we already have a dict. */`
`3290`		`- VISIT(c, expr, kw->value);`
`3291`	`3290`	`ADDOP_O(c, LOAD_CONST, kw->arg, consts);`
	`3291`	`+ VISIT(c, expr, kw->value);`
`3292`	`3292`	`nseen++;`
`3293`	`3293`	`}`
`3294`	`3294`	`else {`