From f3a522ff5594ba9d04bf103dd838f9651868caba Mon Sep 17 00:00:00 2001
From: Tom Scholl <thomasscholl@gmail.com>
Date: Fri, 1 Apr 2011 21:51:59 +0000
Subject: [PATCH 1/2] Removed spammy ticket adverts from guardian recipe

---
 recipes/guardian.recipe | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/guardian.recipe b/recipes/guardian.recipe
index a4329d279e..6211997b06 100644
--- a/recipes/guardian.recipe
+++ b/recipes/guardian.recipe
@@ -36,6 +36,7 @@ class Guardian(BasicNewsRecipe):
     remove_tags = [
                         dict(name='div', attrs={'class':["video-content","videos-third-column"]}),
                         dict(name='div', attrs={'id':["article-toolbox","subscribe-feeds",]}),
+                        dict(name='div', attrs={'class':["guardian-tickets promo-component",]}),
                         dict(name='ul', attrs={'class':["pagination"]}),
                         dict(name='ul', attrs={'id':["content-actions"]}),
                         #dict(name='img'),

From 778ed36afaca1a687e7918ab2293988dc0047860 Mon Sep 17 00:00:00 2001
From: Tom Scholl <thomasscholl@gmail.com>
Date: Sat, 2 Apr 2011 16:23:40 +0000
Subject: [PATCH 2/2] Fixes for International Herald Tribune recipe

---
 recipes/iht.recipe | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/recipes/iht.recipe b/recipes/iht.recipe
index 040ff83927..85a87ccba4 100644
--- a/recipes/iht.recipe
+++ b/recipes/iht.recipe
@@ -15,10 +15,10 @@ class InternationalHeraldTribune(BasicNewsRecipe):
     language = 'en'
 
     oldest_article = 1
-    max_articles_per_feed = 10
+    max_articles_per_feed = 30
     no_stylesheets = True
 
-    remove_tags    = [dict(name='div', attrs={'class':'footer'}),
+    remove_tags    = [dict(name='div', attrs={'class':['footer','header']}),
                       dict(name=['form'])]
     preprocess_regexps = [
             (re.compile(r'<!-- webtrends.*', re.DOTALL),
@@ -26,6 +26,8 @@ class InternationalHeraldTribune(BasicNewsRecipe):
                           ]
     extra_css      = '.headline {font-size: x-large;} \n .fact { padding-top: 10pt  }'
 
+    remove_empty_feeds = True
+    
     feeds          = [
                       (u'Frontpage', u'http://www.iht.com/rss/frontpage.xml'),
                       (u'Business', u'http://www.iht.com/rss/business.xml'),
@@ -46,13 +48,15 @@ class InternationalHeraldTribune(BasicNewsRecipe):
                     ]
     temp_files = []
     articles_are_obfuscated = True
-
-    def get_obfuscated_article(self, url, logger):
+    
+    masthead_url = 'http://graphics8.nytimes.com/images/misc/iht-masthead-logo.gif'
+    
+    def get_obfuscated_article(self, url):
         br = self.get_browser()
         br.open(url)
-        br.select_form(name='printFriendly')
-        res = br.submit()
-        html = res.read()
+        response1 = br.follow_link(url_regex=re.compile(r'.*pagewanted=print.*'))
+        html = response1.read()
+        
         self.temp_files.append(PersistentTemporaryFile('_iht.html'))
         self.temp_files[-1].write(html)
         self.temp_files[-1].close()