1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-32690: Preserve order of locals() (#5379)

Browse Source
This commit is contained in:
Raymond Hettinger 2018-01-28 09:40:24 -08:00 committed by GitHub
parent 059f58ce93
commit a4d0001256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats 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 Normal file
View File

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

4
Objects/frameobject.c
View File

@ -791,7 +791,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 = nmap; --j >= 0; ) { for (j=0; j < nmap; j++) {
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));
@ -844,7 +844,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 = nmap; --j >= 0; ) { for (j=0; j < nmap; j++) {
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));