diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py index cc39b7f0a8..27d0c09d52 100644 --- a/src/calibre/db/backend.py +++ b/src/calibre/db/backend.py @@ -13,7 +13,7 @@ from functools import partial import apsw from polyglot.builtins import (iteritems, itervalues, - unicode_type, reraise, string_or_bytes) + unicode_type, reraise, string_or_bytes, cmp) from calibre import isbytestring, force_unicode, prints, as_unicode from calibre.constants import (iswindows, filesystem_encoding, diff --git a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py index 4cd1399157..efae0d7a20 100644 --- a/src/calibre/devices/kobo/books.py +++ b/src/calibre/devices/kobo/books.py @@ -15,7 +15,7 @@ from calibre.devices.usbms.books import CollectionsBookList from calibre.utils.config_base import prefs from calibre.devices.usbms.driver import debug_print from calibre.ebooks.metadata import author_to_author_sort -from polyglot.builtins import unicode_type, string_or_bytes, iteritems, itervalues +from polyglot.builtins import unicode_type, string_or_bytes, iteritems, itervalues, cmp class Book(Book_): diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index fe052e42f5..93fb4d8686 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -15,7 +15,7 @@ from calibre.constants import preferred_encoding from calibre import isbytestring, force_unicode from calibre.utils.config_base import tweaks from calibre.utils.icu import sort_key -from polyglot.builtins import string_or_bytes, iteritems, itervalues +from polyglot.builtins import string_or_bytes, iteritems, itervalues, cmp class Book(Metadata): diff --git a/src/calibre/ebooks/snb/snbfile.py b/src/calibre/ebooks/snb/snbfile.py index 6dfe66bc8a..5a09652ccf 100644 --- a/src/calibre/ebooks/snb/snbfile.py +++ b/src/calibre/ebooks/snb/snbfile.py @@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en' import sys, struct, zlib, bz2, os from calibre import guess_type -from polyglot.builtins import unicode_type +from polyglot.builtins import unicode_type, cmp class FileStream: diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 359d6418cf..199aafc396 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -21,7 +21,7 @@ from calibre.ebooks.metadata import title_sort, author_to_author_sort from calibre.ebooks.metadata.opf2 import metadata_to_opf from calibre import prints, force_unicode from polyglot.builtins import (iteritems, itervalues, map, - unicode_type, string_or_bytes, zip) + unicode_type, string_or_bytes, zip, cmp) class MetadataBackup(Thread): # {{{ diff --git a/src/calibre/library/sqlite.py b/src/calibre/library/sqlite.py index 488925fe76..24f87467c0 100644 --- a/src/calibre/library/sqlite.py +++ b/src/calibre/library/sqlite.py @@ -20,7 +20,7 @@ from calibre import isbytestring, force_unicode from calibre.constants import iswindows, DEBUG, plugins from calibre.utils.icu import sort_key from calibre import prints -from polyglot.builtins import unicode_type +from polyglot.builtins import unicode_type, cmp from polyglot import reprlib from polyglot.queue import Queue diff --git a/src/calibre/utils/icu.py b/src/calibre/utils/icu.py index 1e26752fb0..278fe26131 100644 --- a/src/calibre/utils/icu.py +++ b/src/calibre/utils/icu.py @@ -16,9 +16,10 @@ import codecs from calibre.constants import plugins from calibre.utils.config_base import tweaks -from polyglot.builtins import unicode_type +from polyglot.builtins import unicode_type, cmp _locale = _collator = _primary_collator = _sort_collator = _numeric_collator = _case_sensitive_collator = None +cmp _none = u'' _none2 = b'' diff --git a/src/calibre/utils/icu_test.py b/src/calibre/utils/icu_test.py index f8a5cbd9dc..67d5131429 100644 --- a/src/calibre/utils/icu_test.py +++ b/src/calibre/utils/icu_test.py @@ -10,7 +10,7 @@ import unittest, sys from contextlib import contextmanager import calibre.utils.icu as icu -from polyglot.builtins import iteritems, unicode_type +from polyglot.builtins import iteritems, unicode_type, cmp @contextmanager