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

News download: Update RSS feedparser module to latest version

Browse Source
This commit is contained in:
Kovid Goyal 2011-03-22 22:03:13 -06:00
parent 5f9032fa25
commit 5be578a9fd
4 changed files with 381 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/constants.py
View File

@ -75,7 +75,7 @@ if plugins is None:
(['usbobserver'] if isosx else []): (['usbobserver'] if isosx else []):
try: try:
p, err = importlib.import_module(plugin), '' p, err = importlib.import_module(plugin), ''
except Exception, err: except Exception as err:
p = None p = None
err = str(err) err = str(err)
plugins[plugin] = (p, err) plugins[plugin] = (p, err)

542
src/calibre/web/feeds/feedparser.py
View File

File diff suppressed because it is too large Load Diff

12
src/calibre/web/feeds/news.py
View File

@ -14,7 +14,7 @@ from contextlib import nested, closing
from calibre import browser, __appname__, iswindows, \ from calibre import browser, __appname__, iswindows, \
strftime, preferred_encoding strftime, preferred_encoding, as_unicode
from calibre.ebooks.BeautifulSoup import BeautifulSoup, NavigableString, CData, Tag from calibre.ebooks.BeautifulSoup import BeautifulSoup, NavigableString, CData, Tag
from calibre.ebooks.metadata.opf2 import OPFCreator from calibre.ebooks.metadata.opf2 import OPFCreator
from calibre import entity_to_unicode from calibre import entity_to_unicode
@ -986,8 +986,8 @@ class BasicNewsRecipe(Recipe):
self.cover_path = None self.cover_path = None
try: try:
cu = self.get_cover_url() cu = self.get_cover_url()
except Exception, err: except Exception as err:
self.log.error(_('Could not download cover: %s')%str(err)) self.log.error(_('Could not download cover: %s')%as_unicode(err))
self.log.debug(traceback.format_exc()) self.log.debug(traceback.format_exc())
else: else:
if not cu: if not cu:
@ -1318,11 +1318,11 @@ class BasicNewsRecipe(Recipe):
oldest_article=self.oldest_article, oldest_article=self.oldest_article,
max_articles_per_feed=self.max_articles_per_feed, max_articles_per_feed=self.max_articles_per_feed,
get_article_url=self.get_article_url)) get_article_url=self.get_article_url))
except Exception, err: except Exception as err:
feed = Feed() feed = Feed()
msg = 'Failed feed: %s'%(title if title else url) msg = 'Failed feed: %s'%(title if title else url)
feed.populate_from_preparsed_feed(msg, []) feed.populate_from_preparsed_feed(msg, [])
feed.description = repr(err) feed.description = as_unicode(err)
parsed_feeds.append(feed) parsed_feeds.append(feed)
self.log.exception(msg) self.log.exception(msg)
@ -1468,7 +1468,7 @@ class CalibrePeriodical(BasicNewsRecipe):
'http://news.calibre-ebook.com/subscribed_files/%s/0/temp.downloaded_recipe' 'http://news.calibre-ebook.com/subscribed_files/%s/0/temp.downloaded_recipe'
% self.calibre_periodicals_slug % self.calibre_periodicals_slug
).read() ).read()
except Exception, e: except Exception as e:
if hasattr(e, 'getcode') and e.getcode() == 403: if hasattr(e, 'getcode') and e.getcode() == 403:
raise DownloadDenied( raise DownloadDenied(
_('You do not have permission to download this issue.' _('You do not have permission to download this issue.'

2
src/calibre/web/fetch/simple.py
View File

@ -210,7 +210,7 @@ class RecursiveFetcher(object):
with closing(open_func(url, timeout=self.timeout)) as f: with closing(open_func(url, timeout=self.timeout)) as f:
data = response(f.read()+f.read()) data = response(f.read()+f.read())
data.newurl = f.geturl() data.newurl = f.geturl()
except urllib2.URLError, err: except urllib2.URLError as err:
if hasattr(err, 'code') and responses.has_key(err.code): if hasattr(err, 'code') and responses.has_key(err.code):
raise FetchError, responses[err.code] raise FetchError, responses[err.code]
if getattr(err, 'reason', [0])[0] == 104 or \ if getattr(err, 'reason', [0])[0] == 104 or \