diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py index 7644bfc0c4..3b5c3e19d0 100644 --- a/src/calibre/ebooks/oeb/stylizer.py +++ b/src/calibre/ebooks/oeb/stylizer.py @@ -19,7 +19,7 @@ from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \ CSSValueList, cssproperties from cssutils.profiles import profiles as cssprofiles from lxml import etree -from lxml.cssselect import css_to_xpath, ExpressionError +from lxml.cssselect import css_to_xpath, ExpressionError, SelectorSyntaxError from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES from calibre.ebooks.oeb.base import XPNSMAP, xpath, urlnormalize from calibre.ebooks.oeb.profile import PROFILES @@ -159,7 +159,9 @@ class Stylizer(object): for _, _, cssdict, text, _ in rules: try: selector = CSSSelector(text) - except (AssertionError, ExpressionError, etree.XPathSyntaxError): + except (AssertionError, ExpressionError, etree.XPathSyntaxError,\ + NameError, # gets thrown on OS X instead of SelectorSyntaxError + SelectorSyntaxError): continue for elem in selector(tree): self.style(elem)._update_cssdict(cssdict) diff --git a/src/calibre/gui2/images/news/nytimes_sub.png b/src/calibre/gui2/images/news/nytimes_sub.png new file mode 100644 index 0000000000..17282300fe Binary files /dev/null and b/src/calibre/gui2/images/news/nytimes_sub.png differ diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py index 9c0a99e814..d1113480ed 100644 --- a/src/calibre/web/feeds/recipes/__init__.py +++ b/src/calibre/web/feeds/recipes/__init__.py @@ -6,7 +6,7 @@ Builtin recipes. ''' recipe_modules = ['recipe_' + r for r in ( 'newsweek', 'atlantic', 'economist', 'portfolio', 'the_register', - 'nytimes', 'usatoday', 'outlook_india', 'bbc', 'greader', 'wsj', + 'usatoday', 'outlook_india', 'bbc', 'greader', 'wsj', 'wired', 'globe_and_mail', 'smh', 'espn', 'business_week', 'miami_herald', 'ars_technica', 'upi', 'new_yorker', 'irish_times', 'iht', 'lanacion', 'discover_magazine', 'scientific_american', 'new_york_review_of_books', diff --git a/todo b/todo index 236bb38edc..8a6739db2d 100644 --- a/todo +++ b/todo @@ -6,3 +6,5 @@ * Use multiprocessing for cpu_count instead of QThread * Rationalize books table. Add a pubdate column, remove the uri column (and associated support in add_books) and convert series_index to a float. + +* Replace single application stuff with Listener from multiprocessing