From a74346498729e91e18f65b15bb536b04581f4a1e Mon Sep 17 00:00:00 2001 From: Sengian Date: Sat, 11 Dec 2010 13:55:31 +0100 Subject: [PATCH] Minor modifications to Nicebooks/Fictionwise --- src/calibre/ebooks/metadata/fictionwise.py | 5 +++-- src/calibre/ebooks/metadata/nicebooks.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/metadata/fictionwise.py b/src/calibre/ebooks/metadata/fictionwise.py index 892e286810..efb19ca249 100644 --- a/src/calibre/ebooks/metadata/fictionwise.py +++ b/src/calibre/ebooks/metadata/fictionwise.py @@ -69,6 +69,7 @@ class BrowserThread(Thread): if '404 - ' in raw: report(self.verbose) self.result = None + return None raw = xml_to_unicode(raw, strip_encoding_pats=True, resolve_entities=True)[0] try: @@ -137,12 +138,12 @@ class Query(object): report(verbose) if callable(getattr(e, 'getcode', None)) and \ e.getcode() == 404: - return + return None if isinstance(getattr(e, 'args', [None])[0], socket.timeout): raise FictionwiseError(_('Fictionwise timed out. Try again later.')) raise FictionwiseError(_('Fictionwise encountered an error.')) if '<title>404 - ' in raw: - return + return None raw = xml_to_unicode(raw, strip_encoding_pats=True, resolve_entities=True)[0] try: diff --git a/src/calibre/ebooks/metadata/nicebooks.py b/src/calibre/ebooks/metadata/nicebooks.py index 8911b31c08..cdf915c827 100644 --- a/src/calibre/ebooks/metadata/nicebooks.py +++ b/src/calibre/ebooks/metadata/nicebooks.py @@ -108,6 +108,7 @@ class BrowserThread(Thread): if '<title>404 - ' in raw: report(self.verbose) self.result = None + return None raw = xml_to_unicode(raw, strip_encoding_pats=True, resolve_entities=True)[0] try: