From 16ac51a652aa23ba8305395f6578cfcbd1b9b7fd Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 31 Dec 2008 10:35:50 -0800 Subject: [PATCH] IGN:Put recipes into their own namespace --- src/calibre/gui2/dialogs/scheduler.py | 5 +++-- src/calibre/web/feeds/recipes/__init__.py | 4 ++-- src/calibre/web/feeds/recipes/{ap.py => recipe_ap.py} | 0 .../recipes/{ars_technica.py => recipe_ars_technica.py} | 0 .../web/feeds/recipes/{atlantic.py => recipe_atlantic.py} | 0 src/calibre/web/feeds/recipes/{b92.py => recipe_b92.py} | 0 .../web/feeds/recipes/{barrons.py => recipe_barrons.py} | 0 src/calibre/web/feeds/recipes/{bbc.py => recipe_bbc.py} | 0 src/calibre/web/feeds/recipes/{blic.py => recipe_blic.py} | 0 .../recipes/{business_week.py => recipe_business_week.py} | 0 .../web/feeds/recipes/{chr_mon.py => recipe_chr_mon.py} | 0 .../web/feeds/recipes/{clarin.py => recipe_clarin.py} | 0 src/calibre/web/feeds/recipes/{cnn.py => recipe_cnn.py} | 0 .../feeds/recipes/{cyberpresse.py => recipe_cyberpresse.py} | 0 .../{daily_telegraph.py => recipe_daily_telegraph.py} | 0 src/calibre/web/feeds/recipes/{danas.py => recipe_danas.py} | 0 .../recipes/{de_standaard.py => recipe_de_standaard.py} | 0 .../feeds/recipes/{demorgen_be.py => recipe_demorgen_be.py} | 0 .../{discover_magazine.py => recipe_discover_magazine.py} | 0 .../web/feeds/recipes/{economist.py => recipe_economist.py} | 0 .../web/feeds/recipes/{el_pais.py => recipe_el_pais.py} | 0 .../web/feeds/recipes/{endgadget.py => recipe_endgadget.py} | 0 src/calibre/web/feeds/recipes/{espn.py => recipe_espn.py} | 0 .../web/feeds/recipes/{faznet.py => recipe_faznet.py} | 0 .../{financial_times.py => recipe_financial_times.py} | 0 .../web/feeds/recipes/{forbes.py => recipe_forbes.py} | 0 .../web/feeds/recipes/{fudzilla.py => recipe_fudzilla.py} | 0 .../recipes/{globe_and_mail.py => recipe_globe_and_mail.py} | 0 .../web/feeds/recipes/{greader.py => recipe_greader.py} | 0 .../web/feeds/recipes/{guardian.py => recipe_guardian.py} | 0 .../web/feeds/recipes/{harpers.py => recipe_harpers.py} | 0 .../recipes/{harpers_full.py => recipe_harpers_full.py} | 0 src/calibre/web/feeds/recipes/{heise.py => recipe_heise.py} | 0 src/calibre/web/feeds/recipes/{iht.py => recipe_iht.py} | 0 .../feeds/recipes/{irish_times.py => recipe_irish_times.py} | 0 .../feeds/recipes/{japan_times.py => recipe_japan_times.py} | 0 src/calibre/web/feeds/recipes/{jpost.py => recipe_jpost.py} | 0 .../web/feeds/recipes/{jutarnji.py => recipe_jutarnji.py} | 0 .../web/feeds/recipes/{lanacion.py => recipe_lanacion.py} | 0 .../web/feeds/recipes/{latimes.py => recipe_latimes.py} | 0 .../web/feeds/recipes/{le_monde.py => recipe_le_monde.py} | 0 .../feeds/recipes/{liberation.py => recipe_liberation.py} | 0 .../recipes/{linux_magazine.py => recipe_linux_magazine.py} | 0 src/calibre/web/feeds/recipes/{lrb.py => recipe_lrb.py} | 0 .../recipes/{moscow_times.py => recipe_moscow_times.py} | 0 src/calibre/web/feeds/recipes/{nasa.py => recipe_nasa.py} | 0 .../recipes/{new_scientist.py => recipe_new_scientist.py} | 0 ...review_of_books.py => recipe_new_york_review_of_books.py} | 0 .../feeds/recipes/{new_yorker.py => recipe_new_yorker.py} | 0 .../web/feeds/recipes/{newsweek.py => recipe_newsweek.py} | 0 .../web/feeds/recipes/{novosti.py => recipe_novosti.py} | 0 src/calibre/web/feeds/recipes/{nspm.py => recipe_nspm.py} | 0 .../web/feeds/recipes/{nspm_int.py => recipe_nspm_int.py} | 0 .../web/feeds/recipes/{nytimes.py => recipe_nytimes.py} | 0 .../feeds/recipes/{nytimes_sub.py => recipe_nytimes_sub.py} | 0 .../recipes/{outlook_india.py => recipe_outlook_india.py} | 0 .../web/feeds/recipes/{pescanik.py => recipe_pescanik.py} | 0 .../web/feeds/recipes/{politika.py => recipe_politika.py} | 0 .../web/feeds/recipes/{portfolio.py => recipe_portfolio.py} | 0 .../web/feeds/recipes/{reuters.py => recipe_reuters.py} | 0 .../{san_fran_chronicle.py => recipe_san_fran_chronicle.py} | 0 .../feeds/recipes/{science_aas.py => recipe_science_aas.py} | 0 .../recipes/{science_news.py => recipe_science_news.py} | 0 .../recipes/{sciencedaily.py => recipe_sciencedaily.py} | 0 ...{scientific_american.py => recipe_scientific_american.py} | 0 .../recipes/{security_watch.py => recipe_security_watch.py} | 0 src/calibre/web/feeds/recipes/{smh.py => recipe_smh.py} | 0 .../feeds/recipes/{spiegel_int.py => recipe_spiegel_int.py} | 0 .../web/feeds/recipes/{spiegelde.py => recipe_spiegelde.py} | 0 ...{st_petersburg_times.py => recipe_st_petersburg_times.py} | 0 .../recipes/{telegraph_uk.py => recipe_telegraph_uk.py} | 0 .../feeds/recipes/{the_nation.py => recipe_the_nation.py} | 0 .../recipes/{the_scotsman.py => recipe_the_scotsman.py} | 0 .../{themarketticker.py => recipe_themarketticker.py} | 0 .../recipes/{time_magazine.py => recipe_time_magazine.py} | 0 .../recipes/{times_online.py => recipe_times_online.py} | 0 .../recipes/{tomshardware.py => recipe_tomshardware.py} | 0 src/calibre/web/feeds/recipes/{upi.py => recipe_upi.py} | 0 .../web/feeds/recipes/{usatoday.py => recipe_usatoday.py} | 0 src/calibre/web/feeds/recipes/{utne.py => recipe_utne.py} | 0 src/calibre/web/feeds/recipes/{vreme.py => recipe_vreme.py} | 0 .../web/feeds/recipes/{wash_post.py => recipe_wash_post.py} | 0 src/calibre/web/feeds/recipes/{wired.py => recipe_wired.py} | 0 src/calibre/web/feeds/recipes/{wsj.py => recipe_wsj.py} | 0 .../web/feeds/recipes/{zeitde.py => recipe_zeitde.py} | 0 85 files changed, 5 insertions(+), 4 deletions(-) rename src/calibre/web/feeds/recipes/{ap.py => recipe_ap.py} (100%) rename src/calibre/web/feeds/recipes/{ars_technica.py => recipe_ars_technica.py} (100%) rename src/calibre/web/feeds/recipes/{atlantic.py => recipe_atlantic.py} (100%) rename src/calibre/web/feeds/recipes/{b92.py => recipe_b92.py} (100%) rename src/calibre/web/feeds/recipes/{barrons.py => recipe_barrons.py} (100%) rename src/calibre/web/feeds/recipes/{bbc.py => recipe_bbc.py} (100%) rename src/calibre/web/feeds/recipes/{blic.py => recipe_blic.py} (100%) rename src/calibre/web/feeds/recipes/{business_week.py => recipe_business_week.py} (100%) rename src/calibre/web/feeds/recipes/{chr_mon.py => recipe_chr_mon.py} (100%) rename src/calibre/web/feeds/recipes/{clarin.py => recipe_clarin.py} (100%) rename src/calibre/web/feeds/recipes/{cnn.py => recipe_cnn.py} (100%) rename src/calibre/web/feeds/recipes/{cyberpresse.py => recipe_cyberpresse.py} (100%) rename src/calibre/web/feeds/recipes/{daily_telegraph.py => recipe_daily_telegraph.py} (100%) rename src/calibre/web/feeds/recipes/{danas.py => recipe_danas.py} (100%) rename src/calibre/web/feeds/recipes/{de_standaard.py => recipe_de_standaard.py} (100%) rename src/calibre/web/feeds/recipes/{demorgen_be.py => recipe_demorgen_be.py} (100%) rename src/calibre/web/feeds/recipes/{discover_magazine.py => recipe_discover_magazine.py} (100%) rename src/calibre/web/feeds/recipes/{economist.py => recipe_economist.py} (100%) rename src/calibre/web/feeds/recipes/{el_pais.py => recipe_el_pais.py} (100%) rename src/calibre/web/feeds/recipes/{endgadget.py => recipe_endgadget.py} (100%) rename src/calibre/web/feeds/recipes/{espn.py => recipe_espn.py} (100%) rename src/calibre/web/feeds/recipes/{faznet.py => recipe_faznet.py} (100%) rename src/calibre/web/feeds/recipes/{financial_times.py => recipe_financial_times.py} (100%) rename src/calibre/web/feeds/recipes/{forbes.py => recipe_forbes.py} (100%) rename src/calibre/web/feeds/recipes/{fudzilla.py => recipe_fudzilla.py} (100%) rename src/calibre/web/feeds/recipes/{globe_and_mail.py => recipe_globe_and_mail.py} (100%) rename src/calibre/web/feeds/recipes/{greader.py => recipe_greader.py} (100%) rename src/calibre/web/feeds/recipes/{guardian.py => recipe_guardian.py} (100%) rename src/calibre/web/feeds/recipes/{harpers.py => recipe_harpers.py} (100%) rename src/calibre/web/feeds/recipes/{harpers_full.py => recipe_harpers_full.py} (100%) rename src/calibre/web/feeds/recipes/{heise.py => recipe_heise.py} (100%) rename src/calibre/web/feeds/recipes/{iht.py => recipe_iht.py} (100%) rename src/calibre/web/feeds/recipes/{irish_times.py => recipe_irish_times.py} (100%) rename src/calibre/web/feeds/recipes/{japan_times.py => recipe_japan_times.py} (100%) rename src/calibre/web/feeds/recipes/{jpost.py => recipe_jpost.py} (100%) rename src/calibre/web/feeds/recipes/{jutarnji.py => recipe_jutarnji.py} (100%) rename src/calibre/web/feeds/recipes/{lanacion.py => recipe_lanacion.py} (100%) rename src/calibre/web/feeds/recipes/{latimes.py => recipe_latimes.py} (100%) rename src/calibre/web/feeds/recipes/{le_monde.py => recipe_le_monde.py} (100%) rename src/calibre/web/feeds/recipes/{liberation.py => recipe_liberation.py} (100%) rename src/calibre/web/feeds/recipes/{linux_magazine.py => recipe_linux_magazine.py} (100%) rename src/calibre/web/feeds/recipes/{lrb.py => recipe_lrb.py} (100%) rename src/calibre/web/feeds/recipes/{moscow_times.py => recipe_moscow_times.py} (100%) rename src/calibre/web/feeds/recipes/{nasa.py => recipe_nasa.py} (100%) rename src/calibre/web/feeds/recipes/{new_scientist.py => recipe_new_scientist.py} (100%) rename src/calibre/web/feeds/recipes/{new_york_review_of_books.py => recipe_new_york_review_of_books.py} (100%) rename src/calibre/web/feeds/recipes/{new_yorker.py => recipe_new_yorker.py} (100%) rename src/calibre/web/feeds/recipes/{newsweek.py => recipe_newsweek.py} (100%) rename src/calibre/web/feeds/recipes/{novosti.py => recipe_novosti.py} (100%) rename src/calibre/web/feeds/recipes/{nspm.py => recipe_nspm.py} (100%) rename src/calibre/web/feeds/recipes/{nspm_int.py => recipe_nspm_int.py} (100%) rename src/calibre/web/feeds/recipes/{nytimes.py => recipe_nytimes.py} (100%) rename src/calibre/web/feeds/recipes/{nytimes_sub.py => recipe_nytimes_sub.py} (100%) rename src/calibre/web/feeds/recipes/{outlook_india.py => recipe_outlook_india.py} (100%) rename src/calibre/web/feeds/recipes/{pescanik.py => recipe_pescanik.py} (100%) rename src/calibre/web/feeds/recipes/{politika.py => recipe_politika.py} (100%) rename src/calibre/web/feeds/recipes/{portfolio.py => recipe_portfolio.py} (100%) rename src/calibre/web/feeds/recipes/{reuters.py => recipe_reuters.py} (100%) rename src/calibre/web/feeds/recipes/{san_fran_chronicle.py => recipe_san_fran_chronicle.py} (100%) rename src/calibre/web/feeds/recipes/{science_aas.py => recipe_science_aas.py} (100%) rename src/calibre/web/feeds/recipes/{science_news.py => recipe_science_news.py} (100%) rename src/calibre/web/feeds/recipes/{sciencedaily.py => recipe_sciencedaily.py} (100%) rename src/calibre/web/feeds/recipes/{scientific_american.py => recipe_scientific_american.py} (100%) rename src/calibre/web/feeds/recipes/{security_watch.py => recipe_security_watch.py} (100%) rename src/calibre/web/feeds/recipes/{smh.py => recipe_smh.py} (100%) rename src/calibre/web/feeds/recipes/{spiegel_int.py => recipe_spiegel_int.py} (100%) rename src/calibre/web/feeds/recipes/{spiegelde.py => recipe_spiegelde.py} (100%) rename src/calibre/web/feeds/recipes/{st_petersburg_times.py => recipe_st_petersburg_times.py} (100%) rename src/calibre/web/feeds/recipes/{telegraph_uk.py => recipe_telegraph_uk.py} (100%) rename src/calibre/web/feeds/recipes/{the_nation.py => recipe_the_nation.py} (100%) rename src/calibre/web/feeds/recipes/{the_scotsman.py => recipe_the_scotsman.py} (100%) rename src/calibre/web/feeds/recipes/{themarketticker.py => recipe_themarketticker.py} (100%) rename src/calibre/web/feeds/recipes/{time_magazine.py => recipe_time_magazine.py} (100%) rename src/calibre/web/feeds/recipes/{times_online.py => recipe_times_online.py} (100%) rename src/calibre/web/feeds/recipes/{tomshardware.py => recipe_tomshardware.py} (100%) rename src/calibre/web/feeds/recipes/{upi.py => recipe_upi.py} (100%) rename src/calibre/web/feeds/recipes/{usatoday.py => recipe_usatoday.py} (100%) rename src/calibre/web/feeds/recipes/{utne.py => recipe_utne.py} (100%) rename src/calibre/web/feeds/recipes/{vreme.py => recipe_vreme.py} (100%) rename src/calibre/web/feeds/recipes/{wash_post.py => recipe_wash_post.py} (100%) rename src/calibre/web/feeds/recipes/{wired.py => recipe_wired.py} (100%) rename src/calibre/web/feeds/recipes/{wsj.py => recipe_wsj.py} (100%) rename src/calibre/web/feeds/recipes/{zeitde.py => recipe_zeitde.py} (100%) diff --git a/src/calibre/gui2/dialogs/scheduler.py b/src/calibre/gui2/dialogs/scheduler.py index afb8c5d916..f61c220bb9 100644 --- a/src/calibre/gui2/dialogs/scheduler.py +++ b/src/calibre/gui2/dialogs/scheduler.py @@ -155,10 +155,11 @@ class RecipeModel(QAbstractListModel, SearchQueryParser): return recipe elif role == Qt.DecorationRole: icon = self.default_icon + icon_path = (':/images/news/%s.png'%recipe.id).replace('recipe_', '') if not recipe.builtin: icon = self.custom_icon - elif QFile(':/images/news/%s.png'%recipe.id).exists(): - icon = QIcon(':/images/news/%s.png'%recipe.id) + elif QFile().exists(icon_path): + icon = QIcon(icon_path) return QVariant(icon) return NONE diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py index 08f5beed5e..9d892b9d40 100644 --- a/src/calibre/web/feeds/recipes/__init__.py +++ b/src/calibre/web/feeds/recipes/__init__.py @@ -4,7 +4,7 @@ __copyright__ = '2008, Kovid Goyal ' ''' Builtin recipes. ''' -recipe_modules = [ +recipe_modules = ['recipe_' + r for r in ( 'newsweek', 'atlantic', 'economist', 'portfolio', 'nytimes', 'usatoday', 'outlook_india', 'bbc', 'greader', 'wsj', 'wired', 'globe_and_mail', 'smh', 'espn', 'business_week', @@ -21,7 +21,7 @@ recipe_modules = [ 'linux_magazine', 'telegraph_uk', 'utne', 'sciencedaily', 'forbes', 'time_magazine', 'endgadget', 'fudzilla', 'nspm_int', 'nspm', 'pescanik', 'spiegel_int', 'themarketticker', 'tomshardware', - ] + )] import re, imp, inspect, time, os from calibre.web.feeds.news import BasicNewsRecipe, CustomIndexRecipe, AutomaticNewsRecipe diff --git a/src/calibre/web/feeds/recipes/ap.py b/src/calibre/web/feeds/recipes/recipe_ap.py similarity index 100% rename from src/calibre/web/feeds/recipes/ap.py rename to src/calibre/web/feeds/recipes/recipe_ap.py diff --git a/src/calibre/web/feeds/recipes/ars_technica.py b/src/calibre/web/feeds/recipes/recipe_ars_technica.py similarity index 100% rename from src/calibre/web/feeds/recipes/ars_technica.py rename to src/calibre/web/feeds/recipes/recipe_ars_technica.py diff --git a/src/calibre/web/feeds/recipes/atlantic.py b/src/calibre/web/feeds/recipes/recipe_atlantic.py similarity index 100% rename from src/calibre/web/feeds/recipes/atlantic.py rename to src/calibre/web/feeds/recipes/recipe_atlantic.py diff --git a/src/calibre/web/feeds/recipes/b92.py b/src/calibre/web/feeds/recipes/recipe_b92.py similarity index 100% rename from src/calibre/web/feeds/recipes/b92.py rename to src/calibre/web/feeds/recipes/recipe_b92.py diff --git a/src/calibre/web/feeds/recipes/barrons.py b/src/calibre/web/feeds/recipes/recipe_barrons.py similarity index 100% rename from src/calibre/web/feeds/recipes/barrons.py rename to src/calibre/web/feeds/recipes/recipe_barrons.py diff --git a/src/calibre/web/feeds/recipes/bbc.py b/src/calibre/web/feeds/recipes/recipe_bbc.py similarity index 100% rename from src/calibre/web/feeds/recipes/bbc.py rename to src/calibre/web/feeds/recipes/recipe_bbc.py diff --git a/src/calibre/web/feeds/recipes/blic.py b/src/calibre/web/feeds/recipes/recipe_blic.py similarity index 100% rename from src/calibre/web/feeds/recipes/blic.py rename to src/calibre/web/feeds/recipes/recipe_blic.py diff --git a/src/calibre/web/feeds/recipes/business_week.py b/src/calibre/web/feeds/recipes/recipe_business_week.py similarity index 100% rename from src/calibre/web/feeds/recipes/business_week.py rename to src/calibre/web/feeds/recipes/recipe_business_week.py diff --git a/src/calibre/web/feeds/recipes/chr_mon.py b/src/calibre/web/feeds/recipes/recipe_chr_mon.py similarity index 100% rename from src/calibre/web/feeds/recipes/chr_mon.py rename to src/calibre/web/feeds/recipes/recipe_chr_mon.py diff --git a/src/calibre/web/feeds/recipes/clarin.py b/src/calibre/web/feeds/recipes/recipe_clarin.py similarity index 100% rename from src/calibre/web/feeds/recipes/clarin.py rename to src/calibre/web/feeds/recipes/recipe_clarin.py diff --git a/src/calibre/web/feeds/recipes/cnn.py b/src/calibre/web/feeds/recipes/recipe_cnn.py similarity index 100% rename from src/calibre/web/feeds/recipes/cnn.py rename to src/calibre/web/feeds/recipes/recipe_cnn.py diff --git a/src/calibre/web/feeds/recipes/cyberpresse.py b/src/calibre/web/feeds/recipes/recipe_cyberpresse.py similarity index 100% rename from src/calibre/web/feeds/recipes/cyberpresse.py rename to src/calibre/web/feeds/recipes/recipe_cyberpresse.py diff --git a/src/calibre/web/feeds/recipes/daily_telegraph.py b/src/calibre/web/feeds/recipes/recipe_daily_telegraph.py similarity index 100% rename from src/calibre/web/feeds/recipes/daily_telegraph.py rename to src/calibre/web/feeds/recipes/recipe_daily_telegraph.py diff --git a/src/calibre/web/feeds/recipes/danas.py b/src/calibre/web/feeds/recipes/recipe_danas.py similarity index 100% rename from src/calibre/web/feeds/recipes/danas.py rename to src/calibre/web/feeds/recipes/recipe_danas.py diff --git a/src/calibre/web/feeds/recipes/de_standaard.py b/src/calibre/web/feeds/recipes/recipe_de_standaard.py similarity index 100% rename from src/calibre/web/feeds/recipes/de_standaard.py rename to src/calibre/web/feeds/recipes/recipe_de_standaard.py diff --git a/src/calibre/web/feeds/recipes/demorgen_be.py b/src/calibre/web/feeds/recipes/recipe_demorgen_be.py similarity index 100% rename from src/calibre/web/feeds/recipes/demorgen_be.py rename to src/calibre/web/feeds/recipes/recipe_demorgen_be.py diff --git a/src/calibre/web/feeds/recipes/discover_magazine.py b/src/calibre/web/feeds/recipes/recipe_discover_magazine.py similarity index 100% rename from src/calibre/web/feeds/recipes/discover_magazine.py rename to src/calibre/web/feeds/recipes/recipe_discover_magazine.py diff --git a/src/calibre/web/feeds/recipes/economist.py b/src/calibre/web/feeds/recipes/recipe_economist.py similarity index 100% rename from src/calibre/web/feeds/recipes/economist.py rename to src/calibre/web/feeds/recipes/recipe_economist.py diff --git a/src/calibre/web/feeds/recipes/el_pais.py b/src/calibre/web/feeds/recipes/recipe_el_pais.py similarity index 100% rename from src/calibre/web/feeds/recipes/el_pais.py rename to src/calibre/web/feeds/recipes/recipe_el_pais.py diff --git a/src/calibre/web/feeds/recipes/endgadget.py b/src/calibre/web/feeds/recipes/recipe_endgadget.py similarity index 100% rename from src/calibre/web/feeds/recipes/endgadget.py rename to src/calibre/web/feeds/recipes/recipe_endgadget.py diff --git a/src/calibre/web/feeds/recipes/espn.py b/src/calibre/web/feeds/recipes/recipe_espn.py similarity index 100% rename from src/calibre/web/feeds/recipes/espn.py rename to src/calibre/web/feeds/recipes/recipe_espn.py diff --git a/src/calibre/web/feeds/recipes/faznet.py b/src/calibre/web/feeds/recipes/recipe_faznet.py similarity index 100% rename from src/calibre/web/feeds/recipes/faznet.py rename to src/calibre/web/feeds/recipes/recipe_faznet.py diff --git a/src/calibre/web/feeds/recipes/financial_times.py b/src/calibre/web/feeds/recipes/recipe_financial_times.py similarity index 100% rename from src/calibre/web/feeds/recipes/financial_times.py rename to src/calibre/web/feeds/recipes/recipe_financial_times.py diff --git a/src/calibre/web/feeds/recipes/forbes.py b/src/calibre/web/feeds/recipes/recipe_forbes.py similarity index 100% rename from src/calibre/web/feeds/recipes/forbes.py rename to src/calibre/web/feeds/recipes/recipe_forbes.py diff --git a/src/calibre/web/feeds/recipes/fudzilla.py b/src/calibre/web/feeds/recipes/recipe_fudzilla.py similarity index 100% rename from src/calibre/web/feeds/recipes/fudzilla.py rename to src/calibre/web/feeds/recipes/recipe_fudzilla.py diff --git a/src/calibre/web/feeds/recipes/globe_and_mail.py b/src/calibre/web/feeds/recipes/recipe_globe_and_mail.py similarity index 100% rename from src/calibre/web/feeds/recipes/globe_and_mail.py rename to src/calibre/web/feeds/recipes/recipe_globe_and_mail.py diff --git a/src/calibre/web/feeds/recipes/greader.py b/src/calibre/web/feeds/recipes/recipe_greader.py similarity index 100% rename from src/calibre/web/feeds/recipes/greader.py rename to src/calibre/web/feeds/recipes/recipe_greader.py diff --git a/src/calibre/web/feeds/recipes/guardian.py b/src/calibre/web/feeds/recipes/recipe_guardian.py similarity index 100% rename from src/calibre/web/feeds/recipes/guardian.py rename to src/calibre/web/feeds/recipes/recipe_guardian.py diff --git a/src/calibre/web/feeds/recipes/harpers.py b/src/calibre/web/feeds/recipes/recipe_harpers.py similarity index 100% rename from src/calibre/web/feeds/recipes/harpers.py rename to src/calibre/web/feeds/recipes/recipe_harpers.py diff --git a/src/calibre/web/feeds/recipes/harpers_full.py b/src/calibre/web/feeds/recipes/recipe_harpers_full.py similarity index 100% rename from src/calibre/web/feeds/recipes/harpers_full.py rename to src/calibre/web/feeds/recipes/recipe_harpers_full.py diff --git a/src/calibre/web/feeds/recipes/heise.py b/src/calibre/web/feeds/recipes/recipe_heise.py similarity index 100% rename from src/calibre/web/feeds/recipes/heise.py rename to src/calibre/web/feeds/recipes/recipe_heise.py diff --git a/src/calibre/web/feeds/recipes/iht.py b/src/calibre/web/feeds/recipes/recipe_iht.py similarity index 100% rename from src/calibre/web/feeds/recipes/iht.py rename to src/calibre/web/feeds/recipes/recipe_iht.py diff --git a/src/calibre/web/feeds/recipes/irish_times.py b/src/calibre/web/feeds/recipes/recipe_irish_times.py similarity index 100% rename from src/calibre/web/feeds/recipes/irish_times.py rename to src/calibre/web/feeds/recipes/recipe_irish_times.py diff --git a/src/calibre/web/feeds/recipes/japan_times.py b/src/calibre/web/feeds/recipes/recipe_japan_times.py similarity index 100% rename from src/calibre/web/feeds/recipes/japan_times.py rename to src/calibre/web/feeds/recipes/recipe_japan_times.py diff --git a/src/calibre/web/feeds/recipes/jpost.py b/src/calibre/web/feeds/recipes/recipe_jpost.py similarity index 100% rename from src/calibre/web/feeds/recipes/jpost.py rename to src/calibre/web/feeds/recipes/recipe_jpost.py diff --git a/src/calibre/web/feeds/recipes/jutarnji.py b/src/calibre/web/feeds/recipes/recipe_jutarnji.py similarity index 100% rename from src/calibre/web/feeds/recipes/jutarnji.py rename to src/calibre/web/feeds/recipes/recipe_jutarnji.py diff --git a/src/calibre/web/feeds/recipes/lanacion.py b/src/calibre/web/feeds/recipes/recipe_lanacion.py similarity index 100% rename from src/calibre/web/feeds/recipes/lanacion.py rename to src/calibre/web/feeds/recipes/recipe_lanacion.py diff --git a/src/calibre/web/feeds/recipes/latimes.py b/src/calibre/web/feeds/recipes/recipe_latimes.py similarity index 100% rename from src/calibre/web/feeds/recipes/latimes.py rename to src/calibre/web/feeds/recipes/recipe_latimes.py diff --git a/src/calibre/web/feeds/recipes/le_monde.py b/src/calibre/web/feeds/recipes/recipe_le_monde.py similarity index 100% rename from src/calibre/web/feeds/recipes/le_monde.py rename to src/calibre/web/feeds/recipes/recipe_le_monde.py diff --git a/src/calibre/web/feeds/recipes/liberation.py b/src/calibre/web/feeds/recipes/recipe_liberation.py similarity index 100% rename from src/calibre/web/feeds/recipes/liberation.py rename to src/calibre/web/feeds/recipes/recipe_liberation.py diff --git a/src/calibre/web/feeds/recipes/linux_magazine.py b/src/calibre/web/feeds/recipes/recipe_linux_magazine.py similarity index 100% rename from src/calibre/web/feeds/recipes/linux_magazine.py rename to src/calibre/web/feeds/recipes/recipe_linux_magazine.py diff --git a/src/calibre/web/feeds/recipes/lrb.py b/src/calibre/web/feeds/recipes/recipe_lrb.py similarity index 100% rename from src/calibre/web/feeds/recipes/lrb.py rename to src/calibre/web/feeds/recipes/recipe_lrb.py diff --git a/src/calibre/web/feeds/recipes/moscow_times.py b/src/calibre/web/feeds/recipes/recipe_moscow_times.py similarity index 100% rename from src/calibre/web/feeds/recipes/moscow_times.py rename to src/calibre/web/feeds/recipes/recipe_moscow_times.py diff --git a/src/calibre/web/feeds/recipes/nasa.py b/src/calibre/web/feeds/recipes/recipe_nasa.py similarity index 100% rename from src/calibre/web/feeds/recipes/nasa.py rename to src/calibre/web/feeds/recipes/recipe_nasa.py diff --git a/src/calibre/web/feeds/recipes/new_scientist.py b/src/calibre/web/feeds/recipes/recipe_new_scientist.py similarity index 100% rename from src/calibre/web/feeds/recipes/new_scientist.py rename to src/calibre/web/feeds/recipes/recipe_new_scientist.py diff --git a/src/calibre/web/feeds/recipes/new_york_review_of_books.py b/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py similarity index 100% rename from src/calibre/web/feeds/recipes/new_york_review_of_books.py rename to src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py diff --git a/src/calibre/web/feeds/recipes/new_yorker.py b/src/calibre/web/feeds/recipes/recipe_new_yorker.py similarity index 100% rename from src/calibre/web/feeds/recipes/new_yorker.py rename to src/calibre/web/feeds/recipes/recipe_new_yorker.py diff --git a/src/calibre/web/feeds/recipes/newsweek.py b/src/calibre/web/feeds/recipes/recipe_newsweek.py similarity index 100% rename from src/calibre/web/feeds/recipes/newsweek.py rename to src/calibre/web/feeds/recipes/recipe_newsweek.py diff --git a/src/calibre/web/feeds/recipes/novosti.py b/src/calibre/web/feeds/recipes/recipe_novosti.py similarity index 100% rename from src/calibre/web/feeds/recipes/novosti.py rename to src/calibre/web/feeds/recipes/recipe_novosti.py diff --git a/src/calibre/web/feeds/recipes/nspm.py b/src/calibre/web/feeds/recipes/recipe_nspm.py similarity index 100% rename from src/calibre/web/feeds/recipes/nspm.py rename to src/calibre/web/feeds/recipes/recipe_nspm.py diff --git a/src/calibre/web/feeds/recipes/nspm_int.py b/src/calibre/web/feeds/recipes/recipe_nspm_int.py similarity index 100% rename from src/calibre/web/feeds/recipes/nspm_int.py rename to src/calibre/web/feeds/recipes/recipe_nspm_int.py diff --git a/src/calibre/web/feeds/recipes/nytimes.py b/src/calibre/web/feeds/recipes/recipe_nytimes.py similarity index 100% rename from src/calibre/web/feeds/recipes/nytimes.py rename to src/calibre/web/feeds/recipes/recipe_nytimes.py diff --git a/src/calibre/web/feeds/recipes/nytimes_sub.py b/src/calibre/web/feeds/recipes/recipe_nytimes_sub.py similarity index 100% rename from src/calibre/web/feeds/recipes/nytimes_sub.py rename to src/calibre/web/feeds/recipes/recipe_nytimes_sub.py diff --git a/src/calibre/web/feeds/recipes/outlook_india.py b/src/calibre/web/feeds/recipes/recipe_outlook_india.py similarity index 100% rename from src/calibre/web/feeds/recipes/outlook_india.py rename to src/calibre/web/feeds/recipes/recipe_outlook_india.py diff --git a/src/calibre/web/feeds/recipes/pescanik.py b/src/calibre/web/feeds/recipes/recipe_pescanik.py similarity index 100% rename from src/calibre/web/feeds/recipes/pescanik.py rename to src/calibre/web/feeds/recipes/recipe_pescanik.py diff --git a/src/calibre/web/feeds/recipes/politika.py b/src/calibre/web/feeds/recipes/recipe_politika.py similarity index 100% rename from src/calibre/web/feeds/recipes/politika.py rename to src/calibre/web/feeds/recipes/recipe_politika.py diff --git a/src/calibre/web/feeds/recipes/portfolio.py b/src/calibre/web/feeds/recipes/recipe_portfolio.py similarity index 100% rename from src/calibre/web/feeds/recipes/portfolio.py rename to src/calibre/web/feeds/recipes/recipe_portfolio.py diff --git a/src/calibre/web/feeds/recipes/reuters.py b/src/calibre/web/feeds/recipes/recipe_reuters.py similarity index 100% rename from src/calibre/web/feeds/recipes/reuters.py rename to src/calibre/web/feeds/recipes/recipe_reuters.py diff --git a/src/calibre/web/feeds/recipes/san_fran_chronicle.py b/src/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py similarity index 100% rename from src/calibre/web/feeds/recipes/san_fran_chronicle.py rename to src/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py diff --git a/src/calibre/web/feeds/recipes/science_aas.py b/src/calibre/web/feeds/recipes/recipe_science_aas.py similarity index 100% rename from src/calibre/web/feeds/recipes/science_aas.py rename to src/calibre/web/feeds/recipes/recipe_science_aas.py diff --git a/src/calibre/web/feeds/recipes/science_news.py b/src/calibre/web/feeds/recipes/recipe_science_news.py similarity index 100% rename from src/calibre/web/feeds/recipes/science_news.py rename to src/calibre/web/feeds/recipes/recipe_science_news.py diff --git a/src/calibre/web/feeds/recipes/sciencedaily.py b/src/calibre/web/feeds/recipes/recipe_sciencedaily.py similarity index 100% rename from src/calibre/web/feeds/recipes/sciencedaily.py rename to src/calibre/web/feeds/recipes/recipe_sciencedaily.py diff --git a/src/calibre/web/feeds/recipes/scientific_american.py b/src/calibre/web/feeds/recipes/recipe_scientific_american.py similarity index 100% rename from src/calibre/web/feeds/recipes/scientific_american.py rename to src/calibre/web/feeds/recipes/recipe_scientific_american.py diff --git a/src/calibre/web/feeds/recipes/security_watch.py b/src/calibre/web/feeds/recipes/recipe_security_watch.py similarity index 100% rename from src/calibre/web/feeds/recipes/security_watch.py rename to src/calibre/web/feeds/recipes/recipe_security_watch.py diff --git a/src/calibre/web/feeds/recipes/smh.py b/src/calibre/web/feeds/recipes/recipe_smh.py similarity index 100% rename from src/calibre/web/feeds/recipes/smh.py rename to src/calibre/web/feeds/recipes/recipe_smh.py diff --git a/src/calibre/web/feeds/recipes/spiegel_int.py b/src/calibre/web/feeds/recipes/recipe_spiegel_int.py similarity index 100% rename from src/calibre/web/feeds/recipes/spiegel_int.py rename to src/calibre/web/feeds/recipes/recipe_spiegel_int.py diff --git a/src/calibre/web/feeds/recipes/spiegelde.py b/src/calibre/web/feeds/recipes/recipe_spiegelde.py similarity index 100% rename from src/calibre/web/feeds/recipes/spiegelde.py rename to src/calibre/web/feeds/recipes/recipe_spiegelde.py diff --git a/src/calibre/web/feeds/recipes/st_petersburg_times.py b/src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py similarity index 100% rename from src/calibre/web/feeds/recipes/st_petersburg_times.py rename to src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py diff --git a/src/calibre/web/feeds/recipes/telegraph_uk.py b/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py similarity index 100% rename from src/calibre/web/feeds/recipes/telegraph_uk.py rename to src/calibre/web/feeds/recipes/recipe_telegraph_uk.py diff --git a/src/calibre/web/feeds/recipes/the_nation.py b/src/calibre/web/feeds/recipes/recipe_the_nation.py similarity index 100% rename from src/calibre/web/feeds/recipes/the_nation.py rename to src/calibre/web/feeds/recipes/recipe_the_nation.py diff --git a/src/calibre/web/feeds/recipes/the_scotsman.py b/src/calibre/web/feeds/recipes/recipe_the_scotsman.py similarity index 100% rename from src/calibre/web/feeds/recipes/the_scotsman.py rename to src/calibre/web/feeds/recipes/recipe_the_scotsman.py diff --git a/src/calibre/web/feeds/recipes/themarketticker.py b/src/calibre/web/feeds/recipes/recipe_themarketticker.py similarity index 100% rename from src/calibre/web/feeds/recipes/themarketticker.py rename to src/calibre/web/feeds/recipes/recipe_themarketticker.py diff --git a/src/calibre/web/feeds/recipes/time_magazine.py b/src/calibre/web/feeds/recipes/recipe_time_magazine.py similarity index 100% rename from src/calibre/web/feeds/recipes/time_magazine.py rename to src/calibre/web/feeds/recipes/recipe_time_magazine.py diff --git a/src/calibre/web/feeds/recipes/times_online.py b/src/calibre/web/feeds/recipes/recipe_times_online.py similarity index 100% rename from src/calibre/web/feeds/recipes/times_online.py rename to src/calibre/web/feeds/recipes/recipe_times_online.py diff --git a/src/calibre/web/feeds/recipes/tomshardware.py b/src/calibre/web/feeds/recipes/recipe_tomshardware.py similarity index 100% rename from src/calibre/web/feeds/recipes/tomshardware.py rename to src/calibre/web/feeds/recipes/recipe_tomshardware.py diff --git a/src/calibre/web/feeds/recipes/upi.py b/src/calibre/web/feeds/recipes/recipe_upi.py similarity index 100% rename from src/calibre/web/feeds/recipes/upi.py rename to src/calibre/web/feeds/recipes/recipe_upi.py diff --git a/src/calibre/web/feeds/recipes/usatoday.py b/src/calibre/web/feeds/recipes/recipe_usatoday.py similarity index 100% rename from src/calibre/web/feeds/recipes/usatoday.py rename to src/calibre/web/feeds/recipes/recipe_usatoday.py diff --git a/src/calibre/web/feeds/recipes/utne.py b/src/calibre/web/feeds/recipes/recipe_utne.py similarity index 100% rename from src/calibre/web/feeds/recipes/utne.py rename to src/calibre/web/feeds/recipes/recipe_utne.py diff --git a/src/calibre/web/feeds/recipes/vreme.py b/src/calibre/web/feeds/recipes/recipe_vreme.py similarity index 100% rename from src/calibre/web/feeds/recipes/vreme.py rename to src/calibre/web/feeds/recipes/recipe_vreme.py diff --git a/src/calibre/web/feeds/recipes/wash_post.py b/src/calibre/web/feeds/recipes/recipe_wash_post.py similarity index 100% rename from src/calibre/web/feeds/recipes/wash_post.py rename to src/calibre/web/feeds/recipes/recipe_wash_post.py diff --git a/src/calibre/web/feeds/recipes/wired.py b/src/calibre/web/feeds/recipes/recipe_wired.py similarity index 100% rename from src/calibre/web/feeds/recipes/wired.py rename to src/calibre/web/feeds/recipes/recipe_wired.py diff --git a/src/calibre/web/feeds/recipes/wsj.py b/src/calibre/web/feeds/recipes/recipe_wsj.py similarity index 100% rename from src/calibre/web/feeds/recipes/wsj.py rename to src/calibre/web/feeds/recipes/recipe_wsj.py diff --git a/src/calibre/web/feeds/recipes/zeitde.py b/src/calibre/web/feeds/recipes/recipe_zeitde.py similarity index 100% rename from src/calibre/web/feeds/recipes/zeitde.py rename to src/calibre/web/feeds/recipes/recipe_zeitde.py