From 48f469cf7c9fdac0a8e64dbf07aae28910b9462b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 10 Dec 2010 19:28:19 -0700 Subject: [PATCH] Better fix for #7852 --- src/calibre/devices/usbms/books.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index 0510d1718d..3372f5c8a5 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -240,9 +240,8 @@ class CollectionsBookList(BookList): return 1 if y is None: return -1 - if isinstance(x, (unicode, str)): - c = strcmp(unicode(force_unicode(x)), - unicode(force_unicode(y))) + if isinstance(x, basestring) and isinstance(y, basestring): + c = strcmp(force_unicode(x), force_unicode(y)) else: c = cmp(x, y) if c != 0: