Skip to content

REF: add custom Exception for safe_sort #25569

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

Closed
wants to merge 12 commits into from
Closed

REF: add custom Exception for safe_sort #25569

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
de1d11b
REF: custom Exception for safe_sort
simonjayhawkins Mar 6, 2019
230dba1
fix py2 invalid syntax
simonjayhawkins Mar 6, 2019
a99e3a2
fix py2 failures
simonjayhawkins Mar 6, 2019
e616071
relax regex
simonjayhawkins Mar 6, 2019
f8a6770
resolve merge conflicts
simonjayhawkins Mar 27, 2019
c868ffb
fix merge conflict unused import
simonjayhawkins Mar 27, 2019
e6c7814
move SortError to core.sorting
simonjayhawkins Mar 27, 2019
8ee7bea
make SortError internal to factorize
simonjayhawkins Mar 27, 2019
a8cc46b
isort imports
simonjayhawkins Mar 27, 2019
2888539
fix ci failure
simonjayhawkins Mar 27, 2019
7af8639
raise TypeError for backwards compatibility
simonjayhawkins Mar 27, 2019
94d76fc
resolve merge conflicts
simonjayhawkins Mar 28, 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
Next Next commit
fix py2 failures
  • Loading branch information
@simonjayhawkins
simonjayhawkins committed Mar 6, 2019
commit a99e3a2f311e05eab4dfdfa5e7909de66e0560e7
2 changes: 1 addition & 1 deletion pandas/core/sorting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,9 +453,9 @@ def sort_mixed(values):
dtype=bool)
try:
nums = np.sort(values[~str_pos])
strs = np.sort(values[str_pos])
except TypeError as e:
raise SortError(e)
strs = np.sort(values[str_pos])
return np.concatenate([nums, np.asarray(strs, dtype=object)])

sorter = None
Expand Down