Skip to content

bpo-36218: Fix handling of heterogeneous values in list.sort #12209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhettinger merged 9 commits into from
Mar 25, 2019
Merged

bpo-36218: Fix handling of heterogeneous values in list.sort #12209

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e75d9fb
Fix sorting of heterogeneous values in list.sort
Mar 7, 2019
8498a21
Add blurb
Mar 7, 2019
60aca1e
Remove early exit when keys are tuples
Mar 12, 2019
eaa7c50
Fix bug found by test_json
Mar 12, 2019
3b02a05
Remove empty line
Mar 12, 2019
47a0688
Simplify logic in pre-sort check
Mar 21, 2019
467cd16
Add test
Mar 21, 2019
8b2224f
Fix coding style
serhiy-storchaka Mar 21, 2019
6286a4b
Fix indentation
Mar 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix indentation
  • Loading branch information
Rémi Lapeyre committed Mar 22, 2019
commit 6286a4bf12bfd4b4d5141582e7a192dbaf606749
19 changes: 11 additions & 8 deletions Objects/listobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2314,17 +2314,20 @@ list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse)
}

if (keys_are_all_same_type) {
if (key_type == &PyLong_Type) {
if (ints_are_bounded && Py_ABS(Py_SIZE(key)) > 1)
ints_are_bounded = 0;
if (key_type == &PyLong_Type &&
ints_are_bounded &&
Py_ABS(Py_SIZE(key)) > 1) {

ints_are_bounded = 0;
}
else if (key_type == &PyUnicode_Type) {
if (strings_are_latin &&
PyUnicode_KIND(key) != PyUnicode_1BYTE_KIND)
strings_are_latin = 0;
else if (key_type == &PyUnicode_Type &&
strings_are_latin &&
PyUnicode_KIND(key) != PyUnicode_1BYTE_KIND) {

strings_are_latin = 0;
}
}
}
}

/* Choose the best compare, given what we now know about the keys. */
if (keys_are_all_same_type) {
Expand Down