diff --git a/recipes/financial_times_uk.recipe b/recipes/financial_times_uk.recipe index 6aa926a076..901e8bbd90 100644 --- a/recipes/financial_times_uk.recipe +++ b/recipes/financial_times_uk.recipe @@ -1,5 +1,5 @@ __license__ = 'GPL v3' -__copyright__ = '2010-2013, Darko Miletic ' +__copyright__ = '2010-2014, Darko Miletic ' ''' www.ft.com/intl/uk-edition ''' @@ -52,19 +52,13 @@ class FinancialTimes(BasicNewsRecipe): return br keep_only_tags = [ - dict(name='div' , attrs={'class':['fullstory fullstoryHeader', 'ft-story-header']}) - ,dict(name='div' , attrs={'class':'standfirst'}) - ,dict(name='div' , attrs={'id' :'storyContent'}) - ,dict(name='div' , attrs={'class':['ft-story-body','index-detail']}) - ,dict(name='h2' , attrs={'class':'entry-title'} ) - ,dict(name='span', attrs={'class':lambda x: x and 'posted-on' in x.split()} ) - ,dict(name='span', attrs={'class':'author_byline'} ) - ,dict(name='div' , attrs={'class':'entry-content'} ) + dict(name='div' , attrs={'class':['master-row editorialSection']}) ] remove_tags = [ dict(name='div', attrs={'id':'floating-con'}) ,dict(name=['meta','iframe','base','object','embed','link']) - ,dict(attrs={'class':['storyTools','story-package','screen-copy','story-package separator','expandable-image']}) + ,dict(attrs={'class':['storyTools','story-package','screen-copy','story-package separator','expandable-image','promobox']}) + ,dict(name='div', attrs={'class':lambda x: x and 'insideArticleRelatedTopics' in x.split()} ) ] remove_attributes = ['width','height','lang'] @@ -158,12 +152,6 @@ class FinancialTimes(BasicNewsRecipe): item['alt'] = 'image' return soup - def get_cover_url(self): - cdate = datetime.date.today() - if cdate.isoweekday() == 7: - cdate -= datetime.timedelta(days=1) - return cdate.strftime('http://specials.ft.com/vtf_pdf/%d%m%y_FRONT1_LON.pdf') - def get_obfuscated_article(self, url): count = 0 while (count < 10): diff --git a/recipes/financial_times_us.recipe b/recipes/financial_times_us.recipe index 7d8eed92f9..b36035d205 100644 --- a/recipes/financial_times_us.recipe +++ b/recipes/financial_times_us.recipe @@ -52,19 +52,13 @@ class FinancialTimes(BasicNewsRecipe): return br keep_only_tags = [ - dict(name='div' , attrs={'class':['fullstory fullstoryHeader', 'ft-story-header']}) - ,dict(name='div' , attrs={'class':'standfirst'}) - ,dict(name='div' , attrs={'id' :'storyContent'}) - ,dict(name='div' , attrs={'class':['ft-story-body','index-detail']}) - ,dict(name='h2' , attrs={'class':'entry-title'} ) - ,dict(name='span', attrs={'class':lambda x: x and 'posted-on' in x.split()} ) - ,dict(name='span', attrs={'class':'author_byline'} ) - ,dict(name='div' , attrs={'class':'entry-content'} ) + dict(name='div' , attrs={'class':['master-row editorialSection']}) ] remove_tags = [ dict(name='div', attrs={'id':'floating-con'}) ,dict(name=['meta','iframe','base','object','embed','link']) - ,dict(attrs={'class':['storyTools','story-package','screen-copy','story-package separator','expandable-image']}) + ,dict(attrs={'class':['storyTools','story-package','screen-copy','story-package separator','expandable-image','promobox']}) + ,dict(name='div', attrs={'class':lambda x: x and 'insideArticleRelatedTopics' in x.split()} ) ] remove_attributes = ['width','height','lang'] @@ -158,12 +152,6 @@ class FinancialTimes(BasicNewsRecipe): item['alt'] = 'image' return soup - def get_cover_url(self): - cdate = datetime.date.today() - if cdate.isoweekday() == 7: - cdate -= datetime.timedelta(days=1) - return cdate.strftime('http://specials.ft.com/vtf_pdf/%d%m%y_FRONT1_USA.pdf') - def get_obfuscated_article(self, url): count = 0 while (count < 10):