mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-01 12:52:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source 
This reverts commit 9105879bfd
in order to keep the behaviour of locals() consistent between
3.6.4 and 3.6.5+.
This commit is contained in:
Nick Coghlan 2018-01-30 15:27:41 +10:00 • committed by GitHub
parent 04f99ba9d7
commit 05f91a42cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Core and Builtins/2018-01-28-09-26-07.bpo-32690.8i9g5P.rst
View file

@ -1,2 +0,0 @@
The locals() dictionary now displays in the lexical order that variables
were defined. Previously, the order was reversed.

4
Objects/frameobject.c
View file

@ -776,7 +776,7 @@ map_to_dict(PyObject *map, Py_ssize_t nmap, PyObject *dict, PyObject **values,
assert(PyTuple_Check(map)); assert(PyTuple_Check(map));
assert(PyDict_Check(dict)); assert(PyDict_Check(dict));
assert(PyTuple_Size(map) >= nmap); assert(PyTuple_Size(map) >= nmap);
for (j=0; j < nmap; j++) { for (j = nmap; --j >= 0; ) {
PyObject *key = PyTuple_GET_ITEM(map, j); PyObject *key = PyTuple_GET_ITEM(map, j);
PyObject *value = values[j]; PyObject *value = values[j];
assert(PyUnicode_Check(key)); 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(PyTuple_Check(map));
assert(PyDict_Check(dict)); assert(PyDict_Check(dict));
assert(PyTuple_Size(map) >= nmap); assert(PyTuple_Size(map) >= nmap);
for (j=0; j < nmap; j++) { for (j = nmap; --j >= 0; ) {
PyObject *key = PyTuple_GET_ITEM(map, j); PyObject *key = PyTuple_GET_ITEM(map, j);
PyObject *value = PyObject_GetItem(dict, key); PyObject *value = PyObject_GetItem(dict, key);
assert(PyUnicode_Check(key)); assert(PyUnicode_Check(key));