From 88d138d2215d1284d54dc9f8638aa9cba2aa6716 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 2 May 2008 15:03:53 -0700 Subject: [PATCH] Remove Dilbert comic strip feed as dilbert.com has blocked access to the images --- src/calibre/web/feeds/recipes/__init__.py | 2 +- src/calibre/web/feeds/recipes/dilbert.py | 35 ----------------------- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 src/calibre/web/feeds/recipes/dilbert.py diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py index b48d3bef80..5a54021bb7 100644 --- a/src/calibre/web/feeds/recipes/__init__.py +++ b/src/calibre/web/feeds/recipes/__init__.py @@ -5,7 +5,7 @@ __copyright__ = '2008, Kovid Goyal ' Builtin recipes. ''' recipes = [ - 'newsweek', 'atlantic', 'economist', 'dilbert', 'portfolio', + 'newsweek', 'atlantic', 'economist', 'portfolio', 'nytimes', 'usatoday', 'outlook_india', 'bbc', 'greader', 'wsj', 'wired', 'globe_and_mail', ] diff --git a/src/calibre/web/feeds/recipes/dilbert.py b/src/calibre/web/feeds/recipes/dilbert.py deleted file mode 100644 index c5091ddf93..0000000000 --- a/src/calibre/web/feeds/recipes/dilbert.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python - -__license__ = 'GPL v3' -__copyright__ = '2008, Kovid Goyal ' -''' -Daily Dilbert -''' -import os -from calibre.web.feeds.news import CustomIndexRecipe -from calibre.ptempfile import PersistentTemporaryDirectory - -class Dilbert(CustomIndexRecipe): - - title = 'Dilbert' - __author__ = 'Kovid Goyal' - description = 'Daily dilbert comic (from the last five days)' - timefmt = ' [%d %b %Y]' - - feeds = [('Dilbert', 'http://feeds.feedburner.com/tapestrydilbert')] - - def get_article_url(self, item): - return item.get('enclosures')[0].get('url') - - def custom_index(self): - tdir = PersistentTemporaryDirectory('feeds2disk_dilbert') - index = os.path.join(tdir, 'index.html') - feed = self.parse_feeds()[0] - - res = '' - for item in feed: - res += '

%s

\n'%(item.title, item.url) - res = '

Dilbert

%s