[3.6] Revert "bpo-32690: Preserve order of locals() (GH-5379) (#5390)"

This reverts commit 9105879bfd7133ecbac67f3e9c0bacf6e477de5a
in order to keep the behaviour of locals() consistent between
3.6.4 and 3.6.5+.

diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-01-28-09-26-07.bpo-32690.8i9g5P.rst b/Misc/NEWS.d/next/Core and Builtins/2018-01-28-09-26-07.bpo-32690.8i9g5P.rst
deleted file mode 100644 (file)
index 1663b96..0000000
--- a/Misc/NEWS.d/next/Core and Builtins/2018-01-28-09-26-07.bpo-32690.8i9g5P.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-The locals() dictionary now displays in the lexical order that variables
-were defined.  Previously, the order was reversed.

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index ca1fbfa1a28f5555a1d961460e7b58f8c0103b2e..62f9f34c8ebf7ceae84276a1cca4d459dcf24ce0 100644 (file)
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -776,7 +776,7 @@ map_to_dict(PyObject *map, Py_ssize_t nmap, PyObject *dict, PyObject **values,
     assert(PyTuple_Check(map));
     assert(PyDict_Check(dict));
     assert(PyTuple_Size(map) >= nmap);
-    for (j=0; j < nmap; j++) {
+    for (j = nmap; --j >= 0; ) {
         PyObject *key = PyTuple_GET_ITEM(map, j);
         PyObject *value = values[j];
         assert(PyUnicode_Check(key));
@@ -829,7 +829,7 @@ dict_to_map(PyObject *map, Py_ssize_t nmap, PyObject *dict, PyObject **values,
     assert(PyTuple_Check(map));
     assert(PyDict_Check(dict));
     assert(PyTuple_Size(map) >= nmap);
-    for (j=0; j < nmap; j++) {
+    for (j = nmap; --j >= 0; ) {
         PyObject *key = PyTuple_GET_ITEM(map, j);
         PyObject *value = PyObject_GetItem(dict, key);
         assert(PyUnicode_Check(key));