comment formating (extra-edit)

recipes/calgary_herald.recipe

@@ -60,20 +60,20 @@ class CanWestPaper(BasicNewsRecipe):
     ]
 
     # un-comment the following six lines for the Vancouver Province
-    # title = u'Vancouver Province'
+    # #    title = u'Vancouver Province'
-    # url_prefix = 'http://www.theprovince.com'
+    # #    url_prefix = 'http://www.theprovince.com'
-    # description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
+    # #    std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
-    # logo_url = 'vplogo.jpg'
+    # #    logo_url = 'vplogo.jpg'
-    # fp_tag = 'CAN_TP'
+    # #    fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
-    # title = u'Vancouver Sun'
+    # #    title = u'Vancouver Sun'
-    # url_prefix = 'http://www.vancouversun.com'
+    # #    url_prefix = 'http://www.vancouversun.com'
-    # description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
+    # #    std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
-    # logo_url = 'vslogo.jpg'
+    # #    logo_url = 'vslogo.jpg'
-    # fp_tag = 'CAN_VS'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
     title = u'Calgary Herald'
@@ -90,7 +90,7 @@ class CanWestPaper(BasicNewsRecipe):
     # #    std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
     # #    logo_url = 'ejlogo.jpg'
     # #    fp_tag = 'CAN_EJ'
-    #
+
     # un-comment the following six lines for the Ottawa Citizen
     # #    title = u'Ottawa Citizen'
     # #    url_prefix = 'http://www.ottawacitizen.com'
@@ -98,7 +98,7 @@ class CanWestPaper(BasicNewsRecipe):
     # #    std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
     # #    logo_url = 'oclogo.jpg'
     # #    fp_tag = 'CAN_OC'
-    #
+
     # un-comment the following six lines for the Montreal Gazette
     # #    title = u'Montreal Gazette'
     # #    url_prefix = 'http://www.montrealgazette.com'

recipes/edmonton_journal.recipe

@@ -60,28 +60,28 @@ class CanWestPaper(BasicNewsRecipe):
     ]
 
     # un-comment the following six lines for the Vancouver Province
-    # title = u'Vancouver Province'
+    # #    title = u'Vancouver Province'
-    # url_prefix = 'http://www.theprovince.com'
+    # #    url_prefix = 'http://www.theprovince.com'
-    # description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
+    # #    std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
-    # logo_url = 'vplogo.jpg'
+    # #    logo_url = 'vplogo.jpg'
-    # fp_tag = 'CAN_TP'
+    # #    fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
-    # title = u'Vancouver Sun'
+    # #    title = u'Vancouver Sun'
-    # url_prefix = 'http://www.vancouversun.com'
+    # #    url_prefix = 'http://www.vancouversun.com'
-    # description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
+    # #    std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
-    # logo_url = 'vslogo.jpg'
+    # #    logo_url = 'vslogo.jpg'
-    # fp_tag = 'CAN_VS'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
-    # title = u'Calgary Herald'
+    # #    title = u'Calgary Herald'
-    # url_prefix = 'http://www.calgaryherald.com'
+    # #    url_prefix = 'http://www.calgaryherald.com'
-    # description = u'News from Calgary, AB'
+    # #    description = u'News from Calgary, AB'
-    # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
+    # #    std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
-    # logo_url = 'chlogo.jpg'
+    # #    logo_url = 'chlogo.jpg'
-    # fp_tag = 'CAN_CH'
+    # #    fp_tag = 'CAN_CH'
 
     # un-comment the following six lines for the Edmonton Journal
     title = u'Edmonton Journal'
@@ -92,20 +92,20 @@ class CanWestPaper(BasicNewsRecipe):
     fp_tag = 'CAN_EJ'
 
     # un-comment the following six lines for the Ottawa Citizen
-#     title = u'Ottawa Citizen'
+    # #    title = u'Ottawa Citizen'
-#     url_prefix = 'http://www.ottawacitizen.com'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
-#     description = u'News from Ottawa, ON'
+    # #    description = u'News from Ottawa, ON'
-#     std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
+    # #    std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
-#     logo_url = 'oclogo.jpg'
+    # #    logo_url = 'oclogo.jpg'
-#     fp_tag = 'CAN_OC'
+    # #    fp_tag = 'CAN_OC'
 
     # un-comment the following six lines for the Montreal Gazette
-#     title = u'Montreal Gazette'
+    # #    title = u'Montreal Gazette'
-#     url_prefix = 'http://www.montrealgazette.com'
+    # #    url_prefix = 'http://www.montrealgazette.com'
-#     description = u'News from Montreal, QC'
+    # #    description = u'News from Montreal, QC'
-#     std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
+    # #    std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
-#     logo_url = 'mglogo.jpg'
+    # #    logo_url = 'mglogo.jpg'
-#     fp_tag = 'CAN_MG'
+    # #    fp_tag = 'CAN_MG'
 
     Kindle_Fire = False
     masthead_url = std_logo_url

recipes/gagadget_de.recipe

@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
+
     # Ukrainian version only
-#
     # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
+
     # remove_tags =   [
     #     dict(name='div', attrs={'class': 'footer-content'}),
     # ]
 
     feeds = [
-#
         # Russian
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
         # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
         # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
         # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
+
         # Ukrainian
-#
         # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
         # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
         # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
+
         # English
-#
         # ('Gagadget', 'https://gagadget.com/en/rss/'),
         # ('News', 'https://gagadget.com/en/rss/news/'),
-#
+
         # German
-#
         ('Gagadget', 'https://gagadget.com/de/rss/'),
         ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
         ('Tests', 'https://gagadget.com/de/rss/reviews/'),
         ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
+
         # Norwegian
-#
         # ('Gagadget', 'https://gagadget.com/nb/rss/'),
         # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
         # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
         # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
+
         # Dutch
-#
         # ('Gagadget', 'https://gagadget.com/nl/rss/'),
         # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
         # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
         # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
+
         # Spanish
-#
         # ('Gagadget', 'https://gagadget.com/es/rss/'),
         # ('Noticias', 'https://gagadget.com/es/rss/news/'),
         # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
         # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
+
         # Italian
-#
         # ('Gagadget', 'https://gagadget.com/it/rss/'),
         # ('Notizia', 'https://gagadget.com/it/rss/news/'),
         # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
         # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
+
         # French
-#
         # ('Gagadget', 'https://gagadget.com/fr/rss/'),
         # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
         # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
         # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
     ]

recipes/gagadget_en.recipe

@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
+
     # Ukrainian version only
-#
     # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
+
     # remove_tags =   [
     #     dict(name='div', attrs={'class': 'footer-content'}),
     # ]
 
     feeds = [
-#
         # Russian
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
         # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
         # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
         # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
+
         # Ukrainian
-#
         # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
         # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
         # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
+
         # English
-#
         ('Gagadget', 'https://gagadget.com/en/rss/'),
         ('News', 'https://gagadget.com/en/rss/news/'),
-#
+
         # German
-#
         # ('Gagadget', 'https://gagadget.com/de/rss/'),
         # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
         # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
         # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
+
         # Norwegian
-#
         # ('Gagadget', 'https://gagadget.com/nb/rss/'),
         # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
         # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
         # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
+
         # Dutch
-#
         # ('Gagadget', 'https://gagadget.com/nl/rss/'),
         # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
         # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
         # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
+
         # Spanish
-#
         # ('Gagadget', 'https://gagadget.com/es/rss/'),
         # ('Noticias', 'https://gagadget.com/es/rss/news/'),
         # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
         # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
+
         # Italian
-#
         # ('Gagadget', 'https://gagadget.com/it/rss/'),
         # ('Notizia', 'https://gagadget.com/it/rss/news/'),
         # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
         # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
+
         # French
-#
         # ('Gagadget', 'https://gagadget.com/fr/rss/'),
         # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
         # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
         # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
     ]

recipes/gagadget_es.recipe

@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
+
     # Ukrainian version only
-#
     # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
+
     # remove_tags =   [
     #     dict(name='div', attrs={'class': 'footer-content'}),
     # ]
 
     feeds = [
-#
         # Russian
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
         # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
         # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
         # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
+
         # Ukrainian
-#
         # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
         # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
         # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
+
         # English
-#
         # ('Gagadget', 'https://gagadget.com/en/rss/'),
         # ('News', 'https://gagadget.com/en/rss/news/'),
-#
+
         # German
-#
         # ('Gagadget', 'https://gagadget.com/de/rss/'),
         # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
         # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
         # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
+
         # Norwegian
-#
         # ('Gagadget', 'https://gagadget.com/nb/rss/'),
         # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
         # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
         # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
+
         # Dutch
-#
         # ('Gagadget', 'https://gagadget.com/nl/rss/'),
         # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
         # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
         # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
+
         # Spanish
-#
         ('Gagadget', 'https://gagadget.com/es/rss/'),
         ('Noticias', 'https://gagadget.com/es/rss/news/'),
         ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
         ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
+
         # Italian
-#
         # ('Gagadget', 'https://gagadget.com/it/rss/'),
         # ('Notizia', 'https://gagadget.com/it/rss/news/'),
         # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
         # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
+
         # French
-#
         # ('Gagadget', 'https://gagadget.com/fr/rss/'),
         # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
         # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
         # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
     ]

recipes/gagadget_fr.recipe

@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
+
     # Ukrainian version only
-#
     # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
+
     # remove_tags =   [
     #     dict(name='div', attrs={'class': 'footer-content'}),
     # ]
 
     feeds = [
-#
         # Russian
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
         # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
         # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
         # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
+
         # Ukrainian
-#
         # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
         # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
         # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
+
         # English
-#
         # ('Gagadget', 'https://gagadget.com/en/rss/'),
         # ('News', 'https://gagadget.com/en/rss/news/'),
-#
+
         # German
-#
         # ('Gagadget', 'https://gagadget.com/de/rss/'),
         # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
         # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
         # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
+
         # Norwegian
-#
         # ('Gagadget', 'https://gagadget.com/nb/rss/'),
         # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
         # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
         # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
+
         # Dutch
-#
         # ('Gagadget', 'https://gagadget.com/nl/rss/'),
         # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
         # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
         # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
+
         # Spanish
-#
         # ('Gagadget', 'https://gagadget.com/es/rss/'),
         # ('Noticias', 'https://gagadget.com/es/rss/news/'),
         # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
         # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
+
         # Italian
-#
         # ('Gagadget', 'https://gagadget.com/it/rss/'),
         # ('Notizia', 'https://gagadget.com/it/rss/news/'),
         # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
         # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
+
         # French
-#
         ('Gagadget', 'https://gagadget.com/fr/rss/'),
         ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
         ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
         ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
     ]

recipes/gagadget_it.recipe

@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
+
     # Ukrainian version only
-#
     # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
+
     # remove_tags =   [
     #     dict(name='div', attrs={'class': 'footer-content'}),
     # ]
 
     feeds = [
-#
         # Russian
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
         # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
         # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
         # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
+
         # Ukrainian
-#
         # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
         # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
         # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
+
         # English
-#
         # ('Gagadget', 'https://gagadget.com/en/rss/'),
         # ('News', 'https://gagadget.com/en/rss/news/'),
-#
+
         # German
-#
         # ('Gagadget', 'https://gagadget.com/de/rss/'),
         # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
         # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
         # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
+
         # Norwegian
-#
         # ('Gagadget', 'https://gagadget.com/nb/rss/'),
         # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
         # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
         # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
+
         # Dutch
-#
         # ('Gagadget', 'https://gagadget.com/nl/rss/'),
         # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
         # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
         # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
+
         # Spanish
-#
         # ('Gagadget', 'https://gagadget.com/es/rss/'),
         # ('Noticias', 'https://gagadget.com/es/rss/news/'),
         # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
         # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
+
         # Italian
-#
         ('Gagadget', 'https://gagadget.com/it/rss/'),
         ('Notizia', 'https://gagadget.com/it/rss/news/'),
         ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
         ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
+
         # French
-#
         # ('Gagadget', 'https://gagadget.com/fr/rss/'),
         # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
         # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
         # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
     ]

recipes/gagadget_nb.recipe

@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
+
     # Ukrainian version only
-#
     # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
+
     # remove_tags =   [
     #     dict(name='div', attrs={'class': 'footer-content'}),
     # ]
 
     feeds = [
-#
         # Russian
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
         # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
         # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
         # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
+
         # Ukrainian
-#
         # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
         # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
         # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
+
         # English
-#
         # ('Gagadget', 'https://gagadget.com/en/rss/'),
         # ('News', 'https://gagadget.com/en/rss/news/'),
-#
+
         # German
-#
         # ('Gagadget', 'https://gagadget.com/de/rss/'),
         # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
         # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
         # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
+
         # Norwegian
-#
         ('Gagadget', 'https://gagadget.com/nb/rss/'),
         ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
         ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
         ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
+
         # Dutch
-#
         # ('Gagadget', 'https://gagadget.com/nl/rss/'),
         # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
         # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
         # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
+
         # Spanish
-#
         # ('Gagadget', 'https://gagadget.com/es/rss/'),
         # ('Noticias', 'https://gagadget.com/es/rss/news/'),
         # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
         # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
+
         # Italian
-#
         # ('Gagadget', 'https://gagadget.com/it/rss/'),
         # ('Notizia', 'https://gagadget.com/it/rss/news/'),
         # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
         # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
+
         # French
-#
         # ('Gagadget', 'https://gagadget.com/fr/rss/'),
         # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
         # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
         # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
     ]

recipes/gagadget_nl.recipe

@@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
+
     # Ukrainian version only
-#
     # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
+
     # remove_tags =   [
     #     dict(name='div', attrs={'class': 'footer-content'}),
     # ]
 
     feeds = [
-#
         # Russian
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
         # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
         # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
         # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
+
         # Ukrainian
-#
         # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
         # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
         # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
+
         # English
-#
         # ('Gagadget', 'https://gagadget.com/en/rss/'),
         # ('News', 'https://gagadget.com/en/rss/news/'),
-#
+
         # German
-#
         # ('Gagadget', 'https://gagadget.com/de/rss/'),
         # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
         # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
         # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
+
         # Norwegian
-#
         # ('Gagadget', 'https://gagadget.com/nb/rss/'),
         # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
         # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
         # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
+
         # Dutch
-#
         ('Gagadget', 'https://gagadget.com/nl/rss/'),
         ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
         ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
         ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
+
         # Spanish
-#
         # ('Gagadget', 'https://gagadget.com/es/rss/'),
         # ('Noticias', 'https://gagadget.com/es/rss/news/'),
         # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
         # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
+
         # Italian
-#
         # ('Gagadget', 'https://gagadget.com/it/rss/'),
         # ('Notizia', 'https://gagadget.com/it/rss/news/'),
         # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
         # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
+
         # French
-#
         # ('Gagadget', 'https://gagadget.com/fr/rss/'),
         # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
         # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
         # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
     ]

recipes/gagadget_ru.recipe

@@ -29,77 +29,65 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
+
     # Ukrainian version only
-#
     # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
-#
+
     # remove_tags =   [
     #     dict(name='div', attrs={'class': 'footer-content'}),
     # ]
 
     feeds = [
-#
         # Russian
-#
         ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
         ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
         ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
         ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
         # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
+
         # Ukrainian
-#
         # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
         # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
         # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
+
         # English
-#
         # ('Gagadget', 'https://gagadget.com/en/rss/'),
         # ('News', 'https://gagadget.com/en/rss/news/'),
-#
+
         # German
-#
         # ('Gagadget', 'https://gagadget.com/de/rss/'),
         # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
         # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
         # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
+
         # Norwegian
-#
         # ('Gagadget', 'https://gagadget.com/nb/rss/'),
         # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
         # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
         # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
+
         # Dutch
-#
         # ('Gagadget', 'https://gagadget.com/nl/rss/'),
         # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
         # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
         # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
+
         # Spanish
-#
         # ('Gagadget', 'https://gagadget.com/es/rss/'),
         # ('Noticias', 'https://gagadget.com/es/rss/news/'),
         # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
         # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
+
         # Italian
-#
         # ('Gagadget', 'https://gagadget.com/it/rss/'),
         # ('Notizia', 'https://gagadget.com/it/rss/news/'),
         # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
         # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
+
         # French
-#
         # ('Gagadget', 'https://gagadget.com/fr/rss/'),
         # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
         # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
         # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
     ]

recipes/gagadget_ua.recipe

@@ -28,9 +28,8 @@ class Gagadget(BasicNewsRecipe):
     remove_tags_before = dict(name='h1')
 
     # remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'})
-#
+
     # Ukrainian version only
-#
     remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'})
 
     remove_tags =   [
@@ -38,67 +37,56 @@ class Gagadget(BasicNewsRecipe):
     ]
 
     feeds = [
-#
         # Russian
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'),
         # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'),
         # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'),
         # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'),
         # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'),
-#
+
         # Ukrainian
-#
         ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'),
         ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'),
         ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'),
         ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'),
-#
+
         # English
-#
         # ('Gagadget', 'https://gagadget.com/en/rss/'),
         # ('News', 'https://gagadget.com/en/rss/news/'),
-#
+
         # German
-#
         # ('Gagadget', 'https://gagadget.com/de/rss/'),
         # ('Nachrichten', 'https://gagadget.com/de/rss/news/'),
         # ('Tests', 'https://gagadget.com/de/rss/reviews/'),
         # ('Artikel', 'https://gagadget.com/de/rss/articles/'),
-#
+
         # Norwegian
-#
         # ('Gagadget', 'https://gagadget.com/nb/rss/'),
         # ('Nyheter', 'https://gagadget.com/nb/rss/news/'),
         # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'),
         # ('Artikler', 'https://gagadget.com/nb/rss/articles/'),
-#
+
         # Dutch
-#
         # ('Gagadget', 'https://gagadget.com/nl/rss/'),
         # ('Nieuws', 'https://gagadget.com/nl/rss/news/'),
         # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'),
         # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'),
-#
+
         # Spanish
-#
         # ('Gagadget', 'https://gagadget.com/es/rss/'),
         # ('Noticias', 'https://gagadget.com/es/rss/news/'),
         # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'),
         # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'),
-#
+
         # Italian
-#
         # ('Gagadget', 'https://gagadget.com/it/rss/'),
         # ('Notizia', 'https://gagadget.com/it/rss/news/'),
         # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'),
         # ('Articoli', 'https://gagadget.com/it/rss/articles/'),
-#
+
         # French
-#
         # ('Gagadget', 'https://gagadget.com/fr/rss/'),
         # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'),
         # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'),
         # ('Des articles', 'https://gagadget.com/fr/rss/articles/'),
-#
     ]

recipes/granta.recipe

@@ -47,7 +47,7 @@ def multiply_with_unknown_component(first_comp, second_comp, result):
 
 
 def solve_captcha(captcha):
-    # # Convert from a word problem into a numeric problem
+    # Convert from a word problem into a numeric problem
     numeric_problem = ''
     for part in captcha.split(' '):
         numeric_problem = numeric_problem + str(text2num(part))

recipes/montreal_gazette.recipe

@@ -60,44 +60,44 @@ class CanWestPaper(BasicNewsRecipe):
     ]
 
     # un-comment the following six lines for the Vancouver Province
-    # title = u'Vancouver Province'
+    # #    title = u'Vancouver Province'
-    # url_prefix = 'http://www.theprovince.com'
+    # #    url_prefix = 'http://www.theprovince.com'
-    # description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
+    # #    std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
-    # logo_url = 'vplogo.jpg'
+    # #    logo_url = 'vplogo.jpg'
-    # fp_tag = 'CAN_TP'
+    # #    fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
-    # title = u'Vancouver Sun'
+    # #    title = u'Vancouver Sun'
-    # url_prefix = 'http://www.vancouversun.com'
+    # #    url_prefix = 'http://www.vancouversun.com'
-    # description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
+    # #    std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
-    # logo_url = 'vslogo.jpg'
+    # #    logo_url = 'vslogo.jpg'
-    # fp_tag = 'CAN_VS'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
-    # title = u'Calgary Herald'
+    # #    title = u'Calgary Herald'
-    # url_prefix = 'http://www.calgaryherald.com'
+    # #    url_prefix = 'http://www.calgaryherald.com'
-    # description = u'News from Calgary, AB'
+    # #    description = u'News from Calgary, AB'
-    # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
+    # #    std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
-    # logo_url = 'chlogo.jpg'
+    # #    logo_url = 'chlogo.jpg'
-    # fp_tag = 'CAN_CH'
+    # #    fp_tag = 'CAN_CH'
 
     # un-comment the following six lines for the Edmonton Journal
-    # title = u'Edmonton Journal'
+    # #    title = u'Edmonton Journal'
-    # url_prefix = 'http://www.edmontonjournal.com'
+    # #    url_prefix = 'http://www.edmontonjournal.com'
-    # description = u'News from Edmonton, AB'
+    # #    description = u'News from Edmonton, AB'
-    # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
+    # #    std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
-    # logo_url = 'ejlogo.jpg'
+    # #    logo_url = 'ejlogo.jpg'
-    # fp_tag = 'CAN_EJ'
+    # #    fp_tag = 'CAN_EJ'
 
     # un-comment the following six lines for the Ottawa Citizen
-    # title = u'Ottawa Citizen'
+    # #    title = u'Ottawa Citizen'
-    # url_prefix = 'http://www.ottawacitizen.com'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
-    # description = u'News from Ottawa, ON'
+    # #    description = u'News from Ottawa, ON'
-    # std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
+    # #    std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
-    # logo_url = 'oclogo.jpg'
+    # #    logo_url = 'oclogo.jpg'
-    # fp_tag = 'CAN_OC'
+    # #    fp_tag = 'CAN_OC'
 
     # un-comment the following six lines for the Montreal Gazette
     title = u'Montreal Gazette'

recipes/ottawa_citizen.recipe

@@ -60,36 +60,36 @@ class CanWestPaper(BasicNewsRecipe):
     ]
 
     # un-comment the following six lines for the Vancouver Province
-    # title = u'Vancouver Province'
+    # #    title = u'Vancouver Province'
-    # url_prefix = 'http://www.theprovince.com'
+    # #    url_prefix = 'http://www.theprovince.com'
-    # description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
+    # #    std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
-    # logo_url = 'vplogo.jpg'
+    # #    logo_url = 'vplogo.jpg'
-    # fp_tag = 'CAN_TP'
+    # #    fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
-    # title = u'Vancouver Sun'
+    # #    title = u'Vancouver Sun'
-    # url_prefix = 'http://www.vancouversun.com'
+    # #    url_prefix = 'http://www.vancouversun.com'
-    # description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
+    # #    std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
-    # logo_url = 'vslogo.jpg'
+    # #    logo_url = 'vslogo.jpg'
-    # fp_tag = 'CAN_VS'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
-    # title = u'Calgary Herald'
+    # #    title = u'Calgary Herald'
-    # url_prefix = 'http://www.calgaryherald.com'
+    # #    url_prefix = 'http://www.calgaryherald.com'
-    # description = u'News from Calgary, AB'
+    # #    description = u'News from Calgary, AB'
-    # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
+    # #    std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
-    # logo_url = 'chlogo.jpg'
+    # #    logo_url = 'chlogo.jpg'
-    # fp_tag = 'CAN_CH'
+    # #    fp_tag = 'CAN_CH'
 
     # un-comment the following six lines for the Edmonton Journal
-    # title = u'Edmonton Journal'
+    # #    title = u'Edmonton Journal'
-    # url_prefix = 'http://www.edmontonjournal.com'
+    # #    url_prefix = 'http://www.edmontonjournal.com'
-    # description = u'News from Edmonton, AB'
+    # #    description = u'News from Edmonton, AB'
-    # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
+    # #    std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
-    # logo_url = 'ejlogo.jpg'
+    # #    logo_url = 'ejlogo.jpg'
-    # fp_tag = 'CAN_EJ'
+    # #    fp_tag = 'CAN_EJ'
 
     # un-comment the following six lines for the Ottawa Citizen
     title = u'Ottawa Citizen'
@@ -100,12 +100,12 @@ class CanWestPaper(BasicNewsRecipe):
     fp_tag = 'CAN_OC'
 
     # un-comment the following six lines for the Montreal Gazette
-#    title = u'Montreal Gazette'
+    # #    title = u'Montreal Gazette'
-#    url_prefix = 'http://www.montrealgazette.com'
+    # #    url_prefix = 'http://www.montrealgazette.com'
-#    description = u'News from Montreal, QC'
+    # #    description = u'News from Montreal, QC'
-#    std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
+    # #    std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
-#    logo_url = 'mglogo.jpg'
+    # #    logo_url = 'mglogo.jpg'
-#    fp_tag = 'CAN_MG'
+    # #    fp_tag = 'CAN_MG'
 
     Kindle_Fire = False
     masthead_url = std_logo_url

recipes/regina_leader_post.recipe

@@ -19,31 +19,31 @@ class CanWestPaper(BasicNewsRecipe):
     # #    url_prefix = 'http://www.timescolonist.com'
     # #    description = u'News from Victoria, BC'
     # #    fp_tag = 'CAN_TC'
-    #
+
     # un-comment the following four lines for the Vancouver Province
     # #    title = u'Vancouver Province'
     # #    url_prefix = 'http://www.theprovince.com'
     # #    description = u'News from Vancouver, BC'
     # #    fp_tag = 'CAN_VP'
-    #
+
     # un-comment the following four lines for the Vancouver Sun
     # #    title = u'Vancouver Sun'
     # #    url_prefix = 'http://www.vancouversun.com'
     # #    description = u'News from Vancouver, BC'
     # #    fp_tag = 'CAN_VS'
-    #
+
     # un-comment the following four lines for the Edmonton Journal
     # #    title = u'Edmonton Journal'
     # #    url_prefix = 'http://www.edmontonjournal.com'
     # #    description = u'News from Edmonton, AB'
     # #    fp_tag = 'CAN_EJ'
-    #
+
     # un-comment the following four lines for the Calgary Herald
     # #    title = u'Calgary Herald'
     # #    url_prefix = 'http://www.calgaryherald.com'
     # #    description = u'News from Calgary, AB'
     # #    fp_tag = 'CAN_CH'
-    #
+
     # un-comment the following four lines for the Regina Leader-Post
     title = u'Regina Leader-Post'
     url_prefix = 'http://www.leaderpost.com'
@@ -55,25 +55,25 @@ class CanWestPaper(BasicNewsRecipe):
     # #    url_prefix = 'http://www.thestarphoenix.com'
     # #    description = u'News from Saskatoon, SK'
     # #    fp_tag = ''
-#
+
     # un-comment the following four lines for the Windsor Star
     # #    title = u'Windsor Star'
     # #    url_prefix = 'http://www.windsorstar.com'
     # #    description = u'News from Windsor, ON'
     # #    fp_tag = 'CAN_'
-#
+
     # un-comment the following four lines for the Ottawa Citizen
     # #    title = u'Ottawa Citizen'
     # #    url_prefix = 'http://www.ottawacitizen.com'
     # #    description = u'News from Ottawa, ON'
     # #    fp_tag = 'CAN_OC'
-#
+
     # un-comment the following four lines for the Montreal Gazette
     # #    title = u'Montreal Gazette'
     # #    url_prefix = 'http://www.montrealgazette.com'
     # #    description = u'News from Montreal, QC'
     # #    fp_tag = 'CAN_MG'
-#
+
     language = 'en_CA'
     __author__ = 'Nick Redding'
     no_stylesheets = True

recipes/salon.recipe

@@ -48,7 +48,7 @@ class Salon_com(BasicNewsRecipe):
         # ('Sustainability', 'http://www.salon.com/category/sustainability/feed/rss/'),
         # ('Entertainment', 'http://www.salon.com/category/entertainment/feed/rss/'),
         # ('Life', 'http://www.salon.com/category/life/feed/rss/'),
-        #
+
         ('News and Politics', 'https://www.salon.com/category/news-and-politics/feed'),
         ('Culture', 'http://www.salon.com/category/culture/feed/'),
         ('Science & Health', 'https://www.salon.com/category/science-and-health/feed/'),

recipes/saskatoon_star_phoenix.recipe

@@ -19,37 +19,37 @@ class CanWestPaper(BasicNewsRecipe):
     # #    url_prefix = 'http://www.timescolonist.com'
     # #    description = u'News from Victoria, BC'
     # #    fp_tag = 'CAN_TC'
-    #
+
     # un-comment the following four lines for the Vancouver Province
     # #    title = u'Vancouver Province'
     # #    url_prefix = 'http://www.theprovince.com'
     # #    description = u'News from Vancouver, BC'
     # #    fp_tag = 'CAN_VP'
-    #
+
     # un-comment the following four lines for the Vancouver Sun
     # #    title = u'Vancouver Sun'
     # #    url_prefix = 'http://www.vancouversun.com'
     # #    description = u'News from Vancouver, BC'
     # #    fp_tag = 'CAN_VS'
-    #
+
     # un-comment the following four lines for the Edmonton Journal
     # #    title = u'Edmonton Journal'
     # #    url_prefix = 'http://www.edmontonjournal.com'
     # #    description = u'News from Edmonton, AB'
     # #    fp_tag = 'CAN_EJ'
-    #
+
     # un-comment the following four lines for the Calgary Herald
     # #    title = u'Calgary Herald'
     # #    url_prefix = 'http://www.calgaryherald.com'
     # #    description = u'News from Calgary, AB'
     # #    fp_tag = 'CAN_CH'
-    #
+
     # un-comment the following four lines for the Regina Leader-Post
     # #    title = u'Regina Leader-Post'
     # #    url_prefix = 'http://www.leaderpost.com'
     # #    description = u'News from Regina, SK'
     # #    fp_tag = ''
-    #
+
     # un-comment the following four lines for the Saskatoon Star-Phoenix
     title = u'Saskatoon Star-Phoenix'
     url_prefix = 'http://www.thestarphoenix.com'
@@ -61,13 +61,13 @@ class CanWestPaper(BasicNewsRecipe):
     # #    url_prefix = 'http://www.windsorstar.com'
     # #    description = u'News from Windsor, ON'
     # #    fp_tag = 'CAN_'
-#
+
     # un-comment the following four lines for the Ottawa Citizen
     # #    title = u'Ottawa Citizen'
     # #    url_prefix = 'http://www.ottawacitizen.com'
     # #    description = u'News from Ottawa, ON'
     # #    fp_tag = 'CAN_OC'
-#
+
     # un-comment the following four lines for the Montreal Gazette
     # #    title = u'Montreal Gazette'
     # #    url_prefix = 'http://www.montrealgazette.com'

recipes/t_invariant_en.recipe

@@ -39,9 +39,7 @@ class TInvariant(BasicNewsRecipe):
 
     feeds = [
         # Russian version
-#
         # Direct links
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'),
         # ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'),
         # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'),
@@ -87,9 +85,7 @@ class TInvariant(BasicNewsRecipe):
         # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'),
         # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'),
         # ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'),
-#
         # Censorship bypass
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'),
         # ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'),
         # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'),
@@ -135,37 +131,24 @@ class TInvariant(BasicNewsRecipe):
         # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'),
         # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'),
         # ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'),
-#
+
         # English version
-#
         # ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'),
-#
         # Censorship bypass
-#
         ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'),
-#
+
         # Ukrainian version
-#
         # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'),
-#
         # Censorship bypass
-#
         # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'),
-#
+
         # German version
-#
         # ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'),
-#
         # Censorship bypass
-#
         # ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'),
-#
+
         # Hebrew version
-#
         # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'),
-#
         # Censorship bypass
-#
         # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'),
-#
     ]

recipes/t_invariant_ru.recipe

@@ -39,9 +39,7 @@ class TInvariant(BasicNewsRecipe):
 
     feeds = [
         # Russian version
-#
         # Direct links
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'),
         # ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'),
         # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'),
@@ -87,9 +85,7 @@ class TInvariant(BasicNewsRecipe):
         # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'),
         # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'),
         # ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'),
-#
         # Censorship bypass
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'),
         ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'),
         ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'),
@@ -137,37 +133,24 @@ class TInvariant(BasicNewsRecipe):
         ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'),
         ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'),
         ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'),
-#
+
         # English version
-#
         # ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'),
-#
         # Censorship bypass
-#
         # ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'),
-#
+
         # Ukrainian version
-#
         # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'),
-#
         # Censorship bypass
-#
         # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'),
-#
+
         # German version
-#
         # ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'),
-#
         # Censorship bypass
-#
         # ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'),
-#
+
         # Hebrew version
-#
         # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'),
-#
         # Censorship bypass
-#
         # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'),
-#
     ]

recipes/t_invariant_ua.recipe

@@ -39,9 +39,7 @@ class TInvariant(BasicNewsRecipe):
 
     feeds = [
         # Russian version
-#
         # Direct links
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'),
         # ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'),
         # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'),
@@ -87,9 +85,7 @@ class TInvariant(BasicNewsRecipe):
         # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'),
         # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'),
         # ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'),
-#
         # Censorship bypass
-#
         # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'),
         # ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'),
         # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'),
@@ -135,37 +131,24 @@ class TInvariant(BasicNewsRecipe):
         # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'),
         # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'),
         # ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'),
-#
+
         # English version
-#
         # ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'),
-#
         # Censorship bypass
-#
         # ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'),
-#
+
         # Ukrainian version
-#
         # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'),
-#
         # Censorship bypass
-#
         ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'),
-#
+
         # German version
-#
         # ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'),
-#
         # Censorship bypass
-#
         # ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'),
-#
+
         # Hebrew version
-#
         # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'),
-#
         # Censorship bypass
-#
         # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'),
-#
     ]

recipes/theoldie.recipe

@@ -90,7 +90,7 @@ class PrivateEyeRecipe(BasicNewsRecipe):
 
     # oldie links/headings often contain the author (in one of various formats
     # 1. Title. By author
-    # .2. Title by author: subtitle
+    # 2. Title by author: subtitle
     # 3. Title: author: subtitle
     title_author_re = re.compile(r'^(.*?)(?:(?: by )|(?:: ))(.*?): (.*?)$')
 

recipes/vancouver_province.recipe

@@ -68,12 +68,12 @@ class CanWestPaper(BasicNewsRecipe):
     fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
-    # title = u'Vancouver Sun'
+    # #    title = u'Vancouver Sun'
-    # url_prefix = 'http://www.vancouversun.com'
+    # #    url_prefix = 'http://www.vancouversun.com'
-    # description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-    # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
+    # #    std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg'
-    # logo_url = 'vslogo.jpg'
+    # #    logo_url = 'vslogo.jpg'
-    # fp_tag = 'CAN_VS'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
     # #    title = u'Calgary Herald'
@@ -82,7 +82,7 @@ class CanWestPaper(BasicNewsRecipe):
     # #    std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
     # #    logo_url = 'chlogo.jpg'
     # #    fp_tag = 'CAN_CH'
-#
+
     # un-comment the following six lines for the Edmonton Journal
     # #    title = u'Edmonton Journal'
     # #    url_prefix = 'http://www.edmontonjournal.com'
@@ -90,7 +90,7 @@ class CanWestPaper(BasicNewsRecipe):
     # #    std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
     # #    logo_url = 'ejlogo.jpg'
     # #    fp_tag = 'CAN_EJ'
-#
+
     # un-comment the following six lines for the Ottawa Citizen
     # #    title = u'Ottawa Citizen'
     # #    url_prefix = 'http://www.ottawacitizen.com'
@@ -98,7 +98,7 @@ class CanWestPaper(BasicNewsRecipe):
     # #    std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
     # #    logo_url = 'oclogo.jpg'
     # #    fp_tag = 'CAN_OC'
-#
+
     # un-comment the following six lines for the Montreal Gazette
     # #    title = u'Montreal Gazette'
     # #    url_prefix = 'http://www.montrealgazette.com'

recipes/vancouver_sun.recipe

@@ -61,12 +61,12 @@ class CanWestPaper(BasicNewsRecipe):
     ]
 
     # un-comment the following six lines for the Vancouver Province
-#     title = u'Vancouver Province'
+    # #    title = u'Vancouver Province'
-#     url_prefix = 'http://www.theprovince.com'
+    # #    url_prefix = 'http://www.theprovince.com'
-#     description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-#     std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
+    # #    std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg'
-#     logo_url = 'vplogo.jpg'
+    # #    logo_url = 'vplogo.jpg'
-#     fp_tag = 'CAN_TP'
+    # #    fp_tag = 'CAN_TP'
 
     # un-comment the following six lines for the Vancouver Sun
     title = u'Vancouver Sun'
@@ -77,36 +77,36 @@ class CanWestPaper(BasicNewsRecipe):
     fp_tag = 'CAN_VS'
 
     # un-comment the following six lines for the Calgary Herald
-#     title = u'Calgary Herald'
+    # #    title = u'Calgary Herald'
-#     url_prefix = 'http://www.calgaryherald.com'
+    # #    url_prefix = 'http://www.calgaryherald.com'
-#     description = u'News from Calgary, AB'
+    # #    description = u'News from Calgary, AB'
-#     std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
+    # #    std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg'
-#     logo_url = 'chlogo.jpg'
+    # #    logo_url = 'chlogo.jpg'
-#     fp_tag = 'CAN_CH'
+    # #    fp_tag = 'CAN_CH'
 
     # un-comment the following six lines for the Edmonton Journal
-#     title = u'Edmonton Journal'
+    # #    title = u'Edmonton Journal'
-#     url_prefix = 'http://www.edmontonjournal.com'
+    # #    url_prefix = 'http://www.edmontonjournal.com'
-#     description = u'News from Edmonton, AB'
+    # #    description = u'News from Edmonton, AB'
-#     std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
+    # #    std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg'
-#     logo_url = 'ejlogo.jpg'
+    # #    logo_url = 'ejlogo.jpg'
-#     fp_tag = 'CAN_EJ'
+    # #    fp_tag = 'CAN_EJ'
 
     # un-comment the following six lines for the Ottawa Citizen
-#     title = u'Ottawa Citizen'
+    # #    title = u'Ottawa Citizen'
-#     url_prefix = 'http://www.ottawacitizen.com'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
-#     description = u'News from Ottawa, ON'
+    # #    description = u'News from Ottawa, ON'
-#     std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
+    # #    std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg'
-#     logo_url = 'oclogo.jpg'
+    # #    logo_url = 'oclogo.jpg'
-#     fp_tag = 'CAN_OC'
+    # #    fp_tag = 'CAN_OC'
 
     # un-comment the following six lines for the Montreal Gazette
-#     title = u'Montreal Gazette'
+    # #    title = u'Montreal Gazette'
-#     url_prefix = 'http://www.montrealgazette.com'
+    # #    url_prefix = 'http://www.montrealgazette.com'
-#     description = u'News from Montreal, QC'
+    # #    description = u'News from Montreal, QC'
-#     std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
+    # #    std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg'
-#     logo_url = 'mglogo.jpg'
+    # #    logo_url = 'mglogo.jpg'
-#     fp_tag = 'CAN_MG'
+    # #    fp_tag = 'CAN_MG'
 
     Kindle_Fire = False
     masthead_url = std_logo_url

recipes/windows_star.recipe

@@ -17,14 +17,14 @@ class CanWestPaper(BasicNewsRecipe):
     description = u'News from Windsor, ON'
 
     # un-comment the following three lines for the Ottawa Citizen
-    # title = u'Ottawa Citizen'
+    # #    title = u'Ottawa Citizen'
-    # url_prefix = 'http://www.ottawacitizen.com'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
-    # description = u'News from Ottawa, ON'
+    # #    description = u'News from Ottawa, ON'
-    #
+
     # un-comment the following three lines for the Montreal Gazette
-    # title = u'Montreal Gazette'
+    # #    title = u'Montreal Gazette'
-    # url_prefix = 'http://www.montrealgazette.com'
+    # #    url_prefix = 'http://www.montrealgazette.com'
-    # description = u'News from Montreal, QC'
+    # #    description = u'News from Montreal, QC'
 
     language = 'en_CA'
     __author__ = 'Nick Redding'

recipes/windsor_star.recipe

@@ -15,46 +15,46 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class CanWestPaper(BasicNewsRecipe):
 
     # un-comment the following four lines for the Victoria Times Colonist
-    #     title = u'Victoria Times Colonist'
+    # #    title = u'Victoria Times Colonist'
-    #     url_prefix = 'http://www.timescolonist.com'
+    # #    url_prefix = 'http://www.timescolonist.com'
-    #     description = u'News from Victoria, BC'
+    # #    description = u'News from Victoria, BC'
-    #     fp_tag = 'CAN_TC'
+    # #    fp_tag = 'CAN_TC'
 
     # un-comment the following four lines for the Vancouver Province
-    #     title = u'Vancouver Province'
+    # #    title = u'Vancouver Province'
-    #     url_prefix = 'http://www.theprovince.com'
+    # #    url_prefix = 'http://www.theprovince.com'
-    #     description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-    #     fp_tag = 'CAN_VP'
+    # #    fp_tag = 'CAN_VP'
 
     # un-comment the following four lines for the Vancouver Sun
-    #     title = u'Vancouver Sun'
+    # #    title = u'Vancouver Sun'
-    #     url_prefix = 'http://www.vancouversun.com'
+    # #    url_prefix = 'http://www.vancouversun.com'
-    #     description = u'News from Vancouver, BC'
+    # #    description = u'News from Vancouver, BC'
-    #     fp_tag = 'CAN_VS'
+    # #    fp_tag = 'CAN_VS'
 
     # un-comment the following four lines for the Edmonton Journal
-    #     title = u'Edmonton Journal'
+    # #    title = u'Edmonton Journal'
-    #     url_prefix = 'http://www.edmontonjournal.com'
+    # #    url_prefix = 'http://www.edmontonjournal.com'
-    #     description = u'News from Edmonton, AB'
+    # #    description = u'News from Edmonton, AB'
-    #     fp_tag = 'CAN_EJ'
+    # #    fp_tag = 'CAN_EJ'
 
     # un-comment the following four lines for the Calgary Herald
-    #     title = u'Calgary Herald'
+    # #    title = u'Calgary Herald'
-    #     url_prefix = 'http://www.calgaryherald.com'
+    # #    url_prefix = 'http://www.calgaryherald.com'
-    #     description = u'News from Calgary, AB'
+    # #    description = u'News from Calgary, AB'
-    #     fp_tag = 'CAN_CH'
+    # #    fp_tag = 'CAN_CH'
 
     # un-comment the following four lines for the Regina Leader-Post
-    #     title = u'Regina Leader-Post'
+    # #    title = u'Regina Leader-Post'
-    #     url_prefix = 'http://www.leaderpost.com'
+    # #    url_prefix = 'http://www.leaderpost.com'
-    #     description = u'News from Regina, SK'
+    # #    description = u'News from Regina, SK'
-    #     fp_tag = ''
+    # #    fp_tag = ''
 
     # un-comment the following four lines for the Saskatoon Star-Phoenix
-    #     title = u'Saskatoon Star-Phoenix'
+    # #    title = u'Saskatoon Star-Phoenix'
-    #     url_prefix = 'http://www.thestarphoenix.com'
+    # #    url_prefix = 'http://www.thestarphoenix.com'
-    #     description = u'News from Saskatoon, SK'
+    # #    description = u'News from Saskatoon, SK'
-    #     fp_tag = ''
+    # #    fp_tag = ''
 
     # un-comment the following four lines for the Windsor Star
     title = u'Windsor Star'
@@ -63,16 +63,16 @@ class CanWestPaper(BasicNewsRecipe):
     fp_tag = 'CAN_'
 
     # un-comment the following four lines for the Ottawa Citizen
-    #     title = u'Ottawa Citizen'
+    # #    title = u'Ottawa Citizen'
-    #     url_prefix = 'http://www.ottawacitizen.com'
+    # #    url_prefix = 'http://www.ottawacitizen.com'
-    #     description = u'News from Ottawa, ON'
+    # #    description = u'News from Ottawa, ON'
-    #     fp_tag = 'CAN_OC'
+    # #    fp_tag = 'CAN_OC'
 
     # un-comment the following four lines for the Montreal Gazette
-    #     title = u'Montreal Gazette'
+    # #    title = u'Montreal Gazette'
-    #     url_prefix = 'http://www.montrealgazette.com'
+    # #    url_prefix = 'http://www.montrealgazette.com'
-    #     description = u'News from Montreal, QC'
+    # #    description = u'News from Montreal, QC'
-    #     fp_tag = 'CAN_MG'
+    # #    fp_tag = 'CAN_MG'
 
     language = 'en_CA'
     __author__ = 'Nick Redding'

recipes/zerkalo.recipe

@@ -28,14 +28,10 @@ class Zerkalo(BasicNewsRecipe):
         ]
 
     feeds = [
-#
         # Original feeds
-#
         # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0437\u0430 \u0434\u0435\u043D\u044C', 'https://news.zerkalo.io/rss/all.rss'),
         # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u043D\u0435\u0434\u0435\u043B\u0438', 'https://news.zerkalo.io/rss/index.rss'),
-#
         # Censorship bypass
-#
         ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0437\u0430 \u0434\u0435\u043D\u044C', 'https://br0wse-zerkalo.site/news/rss/all.rss'),
         ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u043D\u0435\u0434\u0435\u043B\u0438', 'https://br0wse-zerkalo.site/news/rss/index.rss'),
     ]

src/calibre/ebooks/metadata/sources/amazon.py

@@ -1775,7 +1775,7 @@ def manual_tests(domain, **kw):  # {{{
     from calibre.ebooks.metadata.sources.test import authors_test, comments_test, isbn_test, series_test, test_identify_plugin, title_test
     all_tests = {}
     all_tests['com'] = [  # {{{
-        (  # # in title
+        (  # in title
             {'title': 'Expert C# 2008 Business Objects',
              'authors': ['Lhotka']},
             [title_test('Expert C#'),
@@ -1970,7 +1970,7 @@ def manual_tests(domain, **kw):  # {{{
             [title_test('Parting Shot', exact=True),
              authors_test(['Mary Calmes'])]
         ),
-        (  # # in title
+        (  # in title
             {'title': 'Expert C# 2008 Business Objects',
              'authors': ['Lhotka']},
             [title_test('Expert C# 2008 Business Objects'),

src/calibre/ebooks/rtf2xml/hex_2_utf8.py

@@ -188,7 +188,7 @@ class Hex2Utf8:
             self.__dingbats_dict.update(ms_dingbats_dict)
         # load dictionary for caps, and make a string for the replacement
         self.__caps_uni_dict = char_map_obj.get_char_map(map='caps_uni')
-        # # print(self.__caps_uni_dict)
+        # print(self.__caps_uni_dict)
         # don't think I'll need this
         # keys = self.__caps_uni_dict.keys()
         # self.__caps_uni_replace = '|'.join(keys)

src/calibre/ebooks/rtf2xml/options_trem.py

@@ -34,15 +34,15 @@ class ParseOptions:
     def __init__(self, system_string, options_dict):
         self.__system_string = system_string[1:]
         long_list  = self.__make_long_list_func(options_dict)
-        # # print(long_list)
+        # print(long_list)
         short_list = self.__make_short_list_func(options_dict)
-        # # print(short_list)
+        # print(short_list)
         self.__legal_options = long_list + short_list
-        # # print(self.__legal_options)
+        # print(self.__legal_options)
         self.__short_long_dict = self.__make_short_long_dict_func(options_dict)
-        # # print(self.__short_long_dict)
+        # print(self.__short_long_dict)
         self.__opt_with_args = self.__make_options_with_arg_list(options_dict)
-        # # print(self.__opt_with_args)
+        # print(self.__opt_with_args)
         self.__options_okay = 1
 
     def __make_long_list_func(self, options_dict):
@@ -256,16 +256,16 @@ class ParseOptions:
 
     def parse_options(self):
         self.__system_string = self.__sub_short_with_long()
-        # # print('subbed list is  %s' % self.__system_string)
+        # print('subbed list is  %s' % self.__system_string)
         self.__system_string = self.__pair_arg_with_option()
-        # # print('list with pairing is %s' % self.__system_string)
+        # print('list with pairing is %s' % self.__system_string)
         options, arguments  = self.__get_just_options()
-        # # print('options are %s ' % options)
+        # print('options are %s ' % options)
-        # # print('arguments are %s ' % arguments)
+        # print('arguments are %s ' % arguments)
         self.__is_legal_option_func()
         if self.__options_okay:
             options_dict = self.__make_options_dict(options)
-            # # print(options_dict)
+            # print(options_dict)
             return options_dict, arguments
         else:
             return 0,0

src/calibre/ebooks/rtf2xml/sections.py

@@ -285,7 +285,7 @@ class Sections:
                 my_string += f'<{key}>{self.__section_values[key]}'
         my_string += '\n'
         my_string += self.__mark_end
-        # # my_string += line
+        # my_string += line
         if self.__state == 'body':
             self.__write_obj.write(my_string)
         elif self.__state == 'sec_in_field':

src/calibre/gui2/comments_editor.py

@@ -1521,8 +1521,7 @@ class Editor(QWidget):  # {{{
         self.editor.html = v
 
     def change_tab(self, index):
-        # print('reloading:', (index and self.wyswyg_dirty) or (not index and
+        # print('reloading:', (index and self.wyswyg_dirty) or (not index and self.source_dirty))
-        #        self.source_dirty))
         if index == 1:  # changing to code view
             if self.wyswyg_dirty:
                 self.code_edit.setPlainText(self.editor.html)

src/calibre/translations/msgfmt.py

@@ -99,7 +99,7 @@ def generate():
     output = struct.pack('Iiiiiii',
                          0x950412de,       # Magic
                          0,                 # Version
-                         len(keys),         # # of entries
+                         len(keys),         # of entries
                          7*4,               # start of key index
                          7*4+len(keys)*8,   # start of value index
                          0, 0)              # size and offset of hash table

src/odf/grammar.py

@@ -3254,6 +3254,7 @@ allowed_children = {
         ),
         (TEXTNS,'word-count') : (
         ),
+    # allowed_children
 }
 
 #
@@ -3328,7 +3329,7 @@ allows_text = (
         (TEXTNS,'hidden-paragraph'),
         (TEXTNS,'hidden-text'),
         (TEXTNS,'image-count'),
-# allowed_children
+    # allows_text
         (TEXTNS,'index-entry-span'),
         (TEXTNS,'index-title-template'),
         (TEXTNS,'initial-creator'),
@@ -3376,7 +3377,7 @@ allows_text = (
         (TEXTNS,'sequence'),
         (TEXTNS,'sequence-ref'),
         (TEXTNS,'sheet-name'),
-# allowed_children
+    # allows_text
         (TEXTNS,'span'),
         (TEXTNS,'subject'),
         (TEXTNS,'table-count'),
@@ -3392,6 +3393,7 @@ allows_text = (
         (TEXTNS,'variable-input'),
         (TEXTNS,'variable-set'),
         (TEXTNS,'word-count'),
+    # allows_text
 )
 
 # Only the elements with at least one required attribute is listed
@@ -4243,6 +4245,7 @@ required_attributes = {
         (TEXTNS,'variable-set'): (
                 (TEXTNS,'name'),
         ),
+    # required_attributes
 }
 
 # Empty list means the element has no allowed attributes