From e0af0192b7f50339f59e219997c7a03975a2ca4f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 19 Apr 2012 20:30:51 +0530 Subject: [PATCH] ... --- recipes/konflikty_zbrojne.recipe | 13 +++++++------ recipes/metro_news_nl.recipe | 8 ++------ recipes/readitlater.recipe | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/recipes/konflikty_zbrojne.recipe b/recipes/konflikty_zbrojne.recipe index 4211093443..e8b28b49bf 100644 --- a/recipes/konflikty_zbrojne.recipe +++ b/recipes/konflikty_zbrojne.recipe @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from calibre.web.feeds.news import BasicNewsRecipe +from calibre.ebooks.BeautifulSoup import BeautifulSoup class Konflikty(BasicNewsRecipe): title = u'Konflikty Zbrojne' @@ -13,11 +14,11 @@ class Konflikty(BasicNewsRecipe): no_stylesheets = True keep_only_tags=[dict(attrs={'class':['title1', 'image']}), dict(id='body')] - feeds = [(u'Aktualności', u'http://www.konflikty.pl/rss_aktualnosci_10.xml'), - (u'Artyku\u0142y', u'http://www.konflikty.pl/rss_artykuly_10.xml'), - (u'Historia', u'http://www.konflikty.pl/rss_historia_10.xml'), - (u'Militaria', u'http://www.konflikty.pl/rss_militaria_10.xml'), - (u'Relacje', u'http://www.konflikty.pl/rss_relacje_10.xml'), + feeds = [(u'Aktualności', u'http://www.konflikty.pl/rss_aktualnosci_10.xml'), + (u'Artyku\u0142y', u'http://www.konflikty.pl/rss_artykuly_10.xml'), + (u'Historia', u'http://www.konflikty.pl/rss_historia_10.xml'), + (u'Militaria', u'http://www.konflikty.pl/rss_militaria_10.xml'), + (u'Relacje', u'http://www.konflikty.pl/rss_relacje_10.xml'), (u'Recenzje', u'http://www.konflikty.pl/rss_recenzje_10.xml'), (u'Teksty źródłowe', u'http://www.konflikty.pl/rss_tekstyzrodlowe_10.xml')] @@ -29,4 +30,4 @@ class Konflikty(BasicNewsRecipe): image.name='div' pos = len(image.contents) image.insert(pos, BeautifulSoup('

'+image.img['alt']+'

')) - return soup \ No newline at end of file + return soup diff --git a/recipes/metro_news_nl.recipe b/recipes/metro_news_nl.recipe index 9fb41984db..d95f9bdfd7 100644 --- a/recipes/metro_news_nl.recipe +++ b/recipes/metro_news_nl.recipe @@ -78,7 +78,7 @@ class AdvancedUserRecipe1306097511(BasicNewsRecipe): div.column-3 module-title {border: 1px solid #aaa}\ div.article-box-fact div.subtitle, .article-box-fact.module-title, h2.subtitle {font-weight:bold}\ div.article-box-fact div.subtitle, hr.merryhr, .article-box-fact.module-title {color: #24763b}' - + preprocess_regexps = [ (re.compile(r']+top-line[^>]+>', re.DOTALL|re.IGNORECASE), @@ -198,7 +198,6 @@ class MerryProcess(BeautifulSoup): if not part in allfacts: self.myKiller.safeRemovePart(part, True) articlefacts = soup.find('div', {'class':'article-box-fact column'}) - errorOccured=False if (articlefacts and not articlefacts==None): try: contenttag = soup.find('div', {'class':'article-body'}) @@ -208,10 +207,7 @@ class MerryProcess(BeautifulSoup): if foundrighttag == True: contenttag.insert(0, allfactsparent) except: - errorOccured=True - mlog.addTrace() - else: - errorOccured=True + pass return soup def previousNextSibRemover(self, soup, previous=True, soupIsArray=False): diff --git a/recipes/readitlater.recipe b/recipes/readitlater.recipe index 8ed7c43610..92c9aaf9d6 100644 --- a/recipes/readitlater.recipe +++ b/recipes/readitlater.recipe @@ -119,7 +119,7 @@ class Pocket(BasicNewsRecipe): try: from calibre.ebooks import calibre_cover title = self.title if isinstance(self.title, unicode) else \ - self.title.decode(preferred_encoding, 'replace') + self.title.decode('utf-8', 'replace') date = strftime(self.timefmt) time = strftime('[%I:%M %p]') img_data = calibre_cover(title, date, time) @@ -128,4 +128,4 @@ class Pocket(BasicNewsRecipe): except: self.log.exception('Failed to generate default cover') return False - return True \ No newline at end of file + return True