summaryrefslogtreecommitdiff
path: root/natsort/natsort.py
diff options
context:
space:
mode:
authorSeth Morton <seth.m.morton@gmail.com>2023-02-27 00:40:15 -0800
committerSeth Morton <seth.m.morton@gmail.com>2023-02-27 00:40:15 -0800
commit99a252e445a75a115431ee8fa18f487375ca9d20 (patch)
tree150a471469b36a9b03b0012303aa9c91cae4aeb6 /natsort/natsort.py
parente778c1742fc94766b42110580809795605ca3c88 (diff)
parent92969665342450fb450904776a59bd8406dfe65a (diff)
downloadnatsort-99a252e445a75a115431ee8fa18f487375ca9d20.tar.gz
Merge branch 'introduce-consistent-sorting-for-corner-cases'
Diffstat (limited to 'natsort/natsort.py')
-rw-r--r--natsort/natsort.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/natsort/natsort.py b/natsort/natsort.py
index ea83e48..2325443 100644
--- a/natsort/natsort.py
+++ b/natsort/natsort.py
@@ -288,6 +288,8 @@ def natsorted(
['num2', 'num3', 'num5']
"""
+ if alg & ns.PRESORT:
+ seq = sorted(seq, reverse=reverse, key=str)
return sorted(seq, reverse=reverse, key=natsort_keygen(key, alg))
@@ -477,6 +479,8 @@ def index_natsorted(
# Pair the index and sequence together, then sort by element
index_seq_pair = [(x, y) for x, y in enumerate(seq)]
+ if alg & ns.PRESORT:
+ index_seq_pair.sort(reverse=reverse, key=lambda x: str(itemgetter(1)(x)))
index_seq_pair.sort(reverse=reverse, key=natsort_keygen(newkey, alg))
return [x for x, _ in index_seq_pair]
@@ -768,6 +772,7 @@ def os_sorted(
seq: Iterable[T],
key: Optional[Callable[[T], NatsortInType]] = None,
reverse: bool = False,
+ presort: bool = False,
) -> List[T]:
"""
Sort elements in the same order as your operating system's file browser
@@ -810,6 +815,10 @@ def os_sorted(
Return the list in reversed sorted order. The default is
`False`.
+ presort : {{True, False}}, optional
+ Equivalent to adding ``ns.PRESORT``, see :class:`ns` for
+ documentation. The default is `False`.
+
Returns
-------
out : list
@@ -825,4 +834,6 @@ def os_sorted(
This will implicitly coerce all inputs to str before collating.
"""
- return sorted(seq, key=os_sort_keygen(key), reverse=reverse)
+ if presort:
+ seq = sorted(seq, reverse=reverse, key=str)
+ return sorted(seq, reverse=reverse, key=os_sort_keygen(key))