Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2012-07-08 18:22:53 +05:30
parent 6cab70465c
commit 5395cda9c7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/utils/icu.py
View File

@ -155,21 +155,30 @@ def primary_strcmp(a, b):
if _icu_not_ok: if _icu_not_ok:
from calibre.utils.filenames import ascii_text from calibre.utils.filenames import ascii_text
return py_strcmp(ascii_text(a), ascii_text(b)) return py_strcmp(ascii_text(a), ascii_text(b))
return primary_collator().strcmp(a, b) try:
return _primary_collator.strcmp(a, b)
except AttributeError:
return primary_collator().strcmp(a, b)
def primary_find(pat, src): def primary_find(pat, src):
'find that ignores case and accents on letters' 'find that ignores case and accents on letters'
if _icu_not_ok: if _icu_not_ok:
from calibre.utils.filenames import ascii_text from calibre.utils.filenames import ascii_text
return py_find(ascii_text(pat), ascii_text(src)) return py_find(ascii_text(pat), ascii_text(src))
return icu_find(primary_collator(), pat, src) try:
return icu_find(_primary_collator, pat, src)
except AttributeError:
return icu_find(primary_collator(), pat, src)
def primary_sort_key(val): def primary_sort_key(val):
'A sort key that ignores case and diacritics' 'A sort key that ignores case and diacritics'
if _icu_not_ok: if _icu_not_ok:
from calibre.utils.filenames import ascii_text from calibre.utils.filenames import ascii_text
return ascii_text(val).lower() return ascii_text(val).lower()
return primary_collator().sort_key(val) try:
return _primary_collator.sort_key(val)
except AttributeError:
return primary_collator().sort_key(val)
################################################################################ ################################################################################