From 2ee2c64e9e871bd2f67c39218b8f4735bbf42f85 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 6 Apr 2010 22:55:51 +0530
Subject: [PATCH] News download: Remove all <iframe> tags by default as the
 iPad can't handle them

---
 resources/recipes/new_yorker.recipe | 8 --------
 src/calibre/web/feeds/news.py       | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/resources/recipes/new_yorker.recipe b/resources/recipes/new_yorker.recipe
index f404635664..d19c5fb6b0 100644
--- a/resources/recipes/new_yorker.recipe
+++ b/resources/recipes/new_yorker.recipe
@@ -23,14 +23,6 @@ class NewYorker(BasicNewsRecipe):
     category              = 'news, politics, USA'
     encoding              = 'cp1252'
 
-    html2lrf_options = [
-                          '--comment', description
-                        , '--category', category
-                        , '--publisher', publisher
-                        ]
-
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"'
-
     keep_only_tags = [dict(name='div', attrs={'id':'printbody'})]
     remove_tags_after = dict(name='div',attrs={'id':'articlebody'})
     remove_tags = [
diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py
index 66555b0f6f..c4f1138ea4 100644
--- a/src/calibre/web/feeds/news.py
+++ b/src/calibre/web/feeds/news.py
@@ -621,8 +621,9 @@ class BasicNewsRecipe(Recipe):
         for attr in self.remove_attributes:
             for x in soup.findAll(attrs={attr:True}):
                 del x[attr]
-        for base in list(soup.findAll('base')):
+        for base in list(soup.findAll(['base', 'iframe'])):
             base.extract()
+
         return self.postprocess_html(soup, first_fetch)