This commit is contained in:
Kovid Goyal 2012-07-08 18:22:53 +05:30
parent 6cab70465c
commit 5395cda9c7

View File

@ -155,6 +155,9 @@ 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))
try:
return _primary_collator.strcmp(a, b)
except AttributeError:
return primary_collator().strcmp(a, b) return primary_collator().strcmp(a, b)
def primary_find(pat, src): def primary_find(pat, src):
@ -162,6 +165,9 @@ def primary_find(pat, src):
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))
try:
return icu_find(_primary_collator, pat, src)
except AttributeError:
return icu_find(primary_collator(), pat, src) return icu_find(primary_collator(), pat, src)
def primary_sort_key(val): def primary_sort_key(val):
@ -169,6 +175,9 @@ def primary_sort_key(val):
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()
try:
return _primary_collator.sort_key(val)
except AttributeError:
return primary_collator().sort_key(val) return primary_collator().sort_key(val)
################################################################################ ################################################################################