From c4aad96ba8fad7b4482bb02ab86eb15a92728983 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 12 Apr 2012 17:38:10 +0530 Subject: [PATCH] ... --- recipes/forbes.recipe | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/recipes/forbes.recipe b/recipes/forbes.recipe index ef8f665d88..bf407fd217 100644 --- a/recipes/forbes.recipe +++ b/recipes/forbes.recipe @@ -1,4 +1,3 @@ -from calibre.ebooks.BeautifulSoup import BeautifulSoup from calibre.web.feeds.news import BasicNewsRecipe class Forbes(BasicNewsRecipe): @@ -10,20 +9,20 @@ class Forbes(BasicNewsRecipe): language = 'en' no_stylesheets = True - html2lrf_options = ['--base-font-size', '10'] + html2lrf_options = ['--base-font-size', '10'] auto_cleanup = True cover_url = u'http://www.forbes.com/media/current_covers/forbes_120_160.gif' - - feeds = [(u'Latest', u'http://www.forbes.com/news/index.xml'), - (u'Most Popular', u'http://www.forbes.com/feeds/popstories.xml'), - (u'Most Emailed', u'http://www.forbes.com/feeds/mostemailed.xml'), - (u'Faces', u'http://www.forbes.com/facesscan/index.xml'), - (u'Technology', u'http://www.forbes.com/technology/index.xml'), - (u'Personal Tech', u'http://www.forbes.com/personaltech/index.xml'), + + feeds = [(u'Latest', u'http://www.forbes.com/news/index.xml'), + (u'Most Popular', u'http://www.forbes.com/feeds/popstories.xml'), + (u'Most Emailed', u'http://www.forbes.com/feeds/mostemailed.xml'), + (u'Faces', u'http://www.forbes.com/facesscan/index.xml'), + (u'Technology', u'http://www.forbes.com/technology/index.xml'), + (u'Personal Tech', u'http://www.forbes.com/personaltech/index.xml'), (u'Wireless', u'http://www.forbes.com/wireless/index.xml'), - (u'Business', u'http://www.forbes.com/business/index.xml'), - (u'Sports Money', u'http://www.forbes.com/sportsmoney/index.xml'), + (u'Business', u'http://www.forbes.com/business/index.xml'), + (u'Sports Money', u'http://www.forbes.com/sportsmoney/index.xml'), (u'Sports', u'http://www.forbes.com/forbeslife/sports/index.xml'), (u'Vehicles', u'http://www.forbes.com/forbeslife/vehicles/index.xml'), (u'Leadership', u'http://www.forbes.com/leadership/index.xml'),] @@ -34,4 +33,4 @@ class Forbes(BasicNewsRecipe): #print_link = soup.find('a', {'onclick':"s_linkTrackVars='prop18';s_linkType='o';s_linkName='Print';if(typeof(globalPageName)!='undefined')s_prop18=globalPageName;s_lnk=s_co(this);s_gs(s_account);"}) #if print_link is None: #return '' - #return 'http://www.forbes.com' + print_link['href'] + #return 'http://www.forbes.com' + print_link['href']