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

Forgot to change two instances of strcmp to icu_strcmp

Browse Source
This commit is contained in:
Charles Haley 2010-12-05 17:12:21 +00:00
parent b87a738ef2
commit 741073f182
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/devices/usbms/books.py
View File

@ -13,7 +13,7 @@ from calibre.devices.interface import BookList as _BookList
from calibre.constants import preferred_encoding from calibre.constants import preferred_encoding
from calibre import isbytestring from calibre import isbytestring
from calibre.utils.config import prefs, tweaks from calibre.utils.config import prefs, tweaks
from calibre.utils.icu import sort_key from calibre.utils.icu import sort_key, strcmp as icu_strcmp
class Book(Metadata): class Book(Metadata):
def __init__(self, prefix, lpath, size=None, other=None): def __init__(self, prefix, lpath, size=None, other=None):
@ -241,7 +241,7 @@ class CollectionsBookList(BookList):
if y is None: if y is None:
return -1 return -1
if isinstance(x, (unicode, str)): if isinstance(x, (unicode, str)):
c = cmp(sort_key(x), sort_key(y)) c = strcmp(x, y)
else: else:
c = cmp(x, y) c = cmp(x, y)
if c != 0: if c != 0:

6
src/calibre/gui2/library/models.py
View File

@ -18,7 +18,7 @@ from calibre.ebooks.metadata import fmt_sidx, authors_to_string, string_to_autho
from calibre.ptempfile import PersistentTemporaryFile from calibre.ptempfile import PersistentTemporaryFile
from calibre.utils.config import tweaks, prefs from calibre.utils.config import tweaks, prefs
from calibre.utils.date import dt_factory, qt_to_dt, isoformat from calibre.utils.date import dt_factory, qt_to_dt, isoformat
from calibre.utils.icu import sort_key from calibre.utils.icu import sort_key, strcmp as icu_strcmp
from calibre.ebooks.metadata.meta import set_metadata as _set_metadata from calibre.ebooks.metadata.meta import set_metadata as _set_metadata
from calibre.utils.search_query_parser import SearchQueryParser from calibre.utils.search_query_parser import SearchQueryParser
from calibre.library.caches import _match, CONTAINS_MATCH, EQUALS_MATCH, \ from calibre.library.caches import _match, CONTAINS_MATCH, EQUALS_MATCH, \
@ -1023,8 +1023,8 @@ class DeviceBooksModel(BooksModel): # {{{
x = '' x = ''
if y == None: if y == None:
y = '' y = ''
x, y = x.strip().lower(), y.strip().lower() x, y = icu_lower(x.strip()), icu_lower(y.strip())
return cmp(x, y) return icu_strcmp(x, y)
return _strcmp return _strcmp
def datecmp(x, y): def datecmp(x, y):
x = self.db[x].datetime x = self.db[x].datetime