This commit is contained in:
Kovid Goyal 2012-04-19 20:30:51 +05:30
parent 6f1daa27ff
commit e0af0192b7
3 changed files with 11 additions and 14 deletions

View File

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from calibre.web.feeds.news import BasicNewsRecipe from calibre.web.feeds.news import BasicNewsRecipe
from calibre.ebooks.BeautifulSoup import BeautifulSoup
class Konflikty(BasicNewsRecipe): class Konflikty(BasicNewsRecipe):
title = u'Konflikty Zbrojne' title = u'Konflikty Zbrojne'

View File

@ -198,7 +198,6 @@ class MerryProcess(BeautifulSoup):
if not part in allfacts: if not part in allfacts:
self.myKiller.safeRemovePart(part, True) self.myKiller.safeRemovePart(part, True)
articlefacts = soup.find('div', {'class':'article-box-fact column'}) articlefacts = soup.find('div', {'class':'article-box-fact column'})
errorOccured=False
if (articlefacts and not articlefacts==None): if (articlefacts and not articlefacts==None):
try: try:
contenttag = soup.find('div', {'class':'article-body'}) contenttag = soup.find('div', {'class':'article-body'})
@ -208,10 +207,7 @@ class MerryProcess(BeautifulSoup):
if foundrighttag == True: if foundrighttag == True:
contenttag.insert(0, allfactsparent) contenttag.insert(0, allfactsparent)
except: except:
errorOccured=True pass
mlog.addTrace()
else:
errorOccured=True
return soup return soup
def previousNextSibRemover(self, soup, previous=True, soupIsArray=False): def previousNextSibRemover(self, soup, previous=True, soupIsArray=False):

View File

@ -119,7 +119,7 @@ class Pocket(BasicNewsRecipe):
try: try:
from calibre.ebooks import calibre_cover from calibre.ebooks import calibre_cover
title = self.title if isinstance(self.title, unicode) else \ 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) date = strftime(self.timefmt)
time = strftime('[%I:%M %p]') time = strftime('[%I:%M %p]')
img_data = calibre_cover(title, date, time) img_data = calibre_cover(title, date, time)