From 8376081885d49b129ba0af39092d092a90eadb47 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 3 Jul 2010 19:36:11 -0600 Subject: [PATCH] Fix #6085 (News download failure) --- src/calibre/web/fetch/simple.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/web/fetch/simple.py b/src/calibre/web/fetch/simple.py index 41d9c4ed59..0bfca0fc54 100644 --- a/src/calibre/web/fetch/simple.py +++ b/src/calibre/web/fetch/simple.py @@ -238,7 +238,7 @@ class RecursiveFetcher(object): soup = BeautifulSoup(u'') self.log.debug('Downloading') res = self.process_links(soup, url, 0, into_dir='') - self.log.debug('%s saved to %s'%( url, res)) + self.log.debug(url, 'saved to', res) return res def is_link_ok(self, url): @@ -281,7 +281,7 @@ class RecursiveFetcher(object): try: data = self.fetch_url(iurl) except Exception: - self.log.exception('Could not fetch stylesheet %s'% iurl) + self.log.exception('Could not fetch stylesheet ', iurl) continue stylepath = os.path.join(diskpath, 'style'+str(c)+'.css') with self.stylemap_lock: @@ -304,7 +304,7 @@ class RecursiveFetcher(object): try: data = self.fetch_url(iurl) except Exception: - self.log.exception('Could not fetch stylesheet %s'% iurl) + self.log.exception('Could not fetch stylesheet ', iurl) continue c += 1 stylepath = os.path.join(diskpath, 'style'+str(c)+'.css') @@ -337,7 +337,7 @@ class RecursiveFetcher(object): # Skip empty GIF files as PIL errors on them anyway continue except Exception: - self.log.exception('Could not fetch image %s'% iurl) + self.log.exception('Could not fetch image ', iurl) continue c += 1 fname = ascii_filename('img'+str(c)) @@ -423,7 +423,7 @@ class RecursiveFetcher(object): newbaseurl = dsrc.newurl if len(dsrc) == 0 or \ len(re.compile('', re.DOTALL).sub('', dsrc).strip()) == 0: - raise ValueError('No content at URL %s'%iurl) + raise ValueError('No content at URL %r'%iurl) if callable(self.encoding): dsrc = self.encoding(dsrc) elif self.encoding is not None: