Merge from trunk

2025-06-23 15:30:45 -04:00 · 2011-09-27 17:20:36 +02:00 · 2011-09-27 17:20:36 +02:00 · d39ba839e2
commit d39ba839e2
parent b5f8d582b3 c0dc8bc5e0
82 changed files with 2508152 additions and 2508160 deletions
--- a/recipes/aprospect.recipe
+++ b/recipes/aprospect.recipe
@ -1,26 +1,18 @@
-import re
 from calibre.web.feeds.news import BasicNewsRecipe

 class AmericanProspect(BasicNewsRecipe):
    title          = u'American Prospect'
-    __author__     = u'Michael Heinz'
-    oldest_article = 30
-    language = 'en'
-    max_articles_per_feed = 100
-    recursions = 0
-    no_stylesheets = True
-    remove_javascript = True
+    __author__     = u'Michael Heinz, a.peter'
+    version        = 2

-    preprocess_regexps = [
-        (re.compile(r'<body.*?<div class="pad_10L10R">', re.DOTALL|re.IGNORECASE), lambda match: '<body><div>'),
-        (re.compile(r'</div>.*</body>', re.DOTALL|re.IGNORECASE), lambda match: '</div></body>'),
-        (re.compile('\r'),lambda match: ''),
-        (re.compile(r'<!-- .+? -->', re.DOTALL|re.IGNORECASE), lambda match: ''),
-        (re.compile(r'<link .+?>', re.DOTALL|re.IGNORECASE), lambda match: ''),
-        (re.compile(r'<script.*?</script>', re.DOTALL|re.IGNORECASE), lambda match: ''),
-        (re.compile(r'<noscript.*?</noscript>', re.DOTALL|re.IGNORECASE), lambda match: ''),
-        (re.compile(r'<meta .*?/>', re.DOTALL|re.IGNORECASE), lambda match: ''),
-    ]
+    oldest_article        = 30
+    language              = 'en'
+    max_articles_per_feed = 100
+    recursions            = 0
+    no_stylesheets        = True
+    remove_javascript     = True
+
+    keep_only_tags = [dict(name='div', attrs={'class':'pad_10L10R'})]
+    remove_tags    = [dict(name='form'), dict(name='div', attrs={'class':['bkt_caption','sharebox noprint','badgebox']})]

    feeds       = [(u'Articles', u'feed://www.prospect.org/articles_rss.jsp')]
-
--- a/setup/iso_639/af.po
+++ b/setup/iso_639/af.po
--- a/setup/iso_639/am.po
+++ b/setup/iso_639/am.po
--- a/setup/iso_639/ar.po
+++ b/setup/iso_639/ar.po
--- a/setup/iso_639/az.po
+++ b/setup/iso_639/az.po
--- a/setup/iso_639/bg.po
+++ b/setup/iso_639/bg.po
--- a/setup/iso_639/bn_IN.po
+++ b/setup/iso_639/bn_IN.po
--- a/setup/iso_639/br.po
+++ b/setup/iso_639/br.po
--- a/setup/iso_639/bs.po
+++ b/setup/iso_639/bs.po
--- a/setup/iso_639/byn.po
+++ b/setup/iso_639/byn.po
--- a/setup/iso_639/ca.po
+++ b/setup/iso_639/ca.po
--- a/setup/iso_639/crh.po
+++ b/setup/iso_639/crh.po
--- a/setup/iso_639/cs.po
+++ b/setup/iso_639/cs.po
--- a/setup/iso_639/cy.po
+++ b/setup/iso_639/cy.po
--- a/setup/iso_639/da.po
+++ b/setup/iso_639/da.po
--- a/setup/iso_639/de.po
+++ b/setup/iso_639/de.po
--- a/setup/iso_639/el.po
+++ b/setup/iso_639/el.po
--- a/setup/iso_639/eo.po
+++ b/setup/iso_639/eo.po
--- a/setup/iso_639/es.po
+++ b/setup/iso_639/es.po
--- a/setup/iso_639/et.po
+++ b/setup/iso_639/et.po
--- a/setup/iso_639/eu.po
+++ b/setup/iso_639/eu.po
--- a/setup/iso_639/fa.po
+++ b/setup/iso_639/fa.po
--- a/setup/iso_639/fi.po
+++ b/setup/iso_639/fi.po
--- a/setup/iso_639/fr.po
+++ b/setup/iso_639/fr.po
--- a/setup/iso_639/ga.po
+++ b/setup/iso_639/ga.po
--- a/setup/iso_639/gez.po
+++ b/setup/iso_639/gez.po
--- a/setup/iso_639/gl.po
+++ b/setup/iso_639/gl.po
--- a/setup/iso_639/gu.po
+++ b/setup/iso_639/gu.po
--- a/setup/iso_639/he.po
+++ b/setup/iso_639/he.po
--- a/setup/iso_639/hi.po
+++ b/setup/iso_639/hi.po
--- a/setup/iso_639/hr.po
+++ b/setup/iso_639/hr.po
--- a/setup/iso_639/hu.po
+++ b/setup/iso_639/hu.po
--- a/setup/iso_639/id.po
+++ b/setup/iso_639/id.po
--- a/setup/iso_639/is.po
+++ b/setup/iso_639/is.po
--- a/setup/iso_639/iso_639_3.pot
+++ b/setup/iso_639/iso_639_3.pot
--- a/setup/iso_639/iso_639_3.xml
+++ b/setup/iso_639/iso_639_3.xml
--- a/setup/iso_639/it.po
+++ b/setup/iso_639/it.po
--- a/setup/iso_639/ja.po
+++ b/setup/iso_639/ja.po
--- a/setup/iso_639/kn.po
+++ b/setup/iso_639/kn.po
--- a/setup/iso_639/ko.po
+++ b/setup/iso_639/ko.po
--- a/setup/iso_639/kok.po
+++ b/setup/iso_639/kok.po
--- a/setup/iso_639/lt.po
+++ b/setup/iso_639/lt.po
--- a/setup/iso_639/lv.po
+++ b/setup/iso_639/lv.po
--- a/setup/iso_639/mi.po
+++ b/setup/iso_639/mi.po
--- a/setup/iso_639/mk.po
+++ b/setup/iso_639/mk.po
--- a/setup/iso_639/mn.po
+++ b/setup/iso_639/mn.po
--- a/setup/iso_639/mr.po
+++ b/setup/iso_639/mr.po
--- a/setup/iso_639/ms.po
+++ b/setup/iso_639/ms.po
--- a/setup/iso_639/mt.po
+++ b/setup/iso_639/mt.po
--- a/setup/iso_639/nb.po
+++ b/setup/iso_639/nb.po
--- a/setup/iso_639/nl.po
+++ b/setup/iso_639/nl.po
--- a/setup/iso_639/nn.po
+++ b/setup/iso_639/nn.po
--- a/setup/iso_639/nso.po
+++ b/setup/iso_639/nso.po
--- a/setup/iso_639/oc.po
+++ b/setup/iso_639/oc.po
--- a/setup/iso_639/or.po
+++ b/setup/iso_639/or.po
--- a/setup/iso_639/pa.po
+++ b/setup/iso_639/pa.po
--- a/setup/iso_639/pl.po
+++ b/setup/iso_639/pl.po
--- a/setup/iso_639/ps.po
+++ b/setup/iso_639/ps.po
--- a/setup/iso_639/pt.po
+++ b/setup/iso_639/pt.po
--- a/setup/iso_639/pt_BR.po
+++ b/setup/iso_639/pt_BR.po
--- a/setup/iso_639/ro.po
+++ b/setup/iso_639/ro.po
--- a/setup/iso_639/ru.po
+++ b/setup/iso_639/ru.po
--- a/setup/iso_639/rw.po
+++ b/setup/iso_639/rw.po
--- a/setup/iso_639/sk.po
+++ b/setup/iso_639/sk.po
--- a/setup/iso_639/sl.po
+++ b/setup/iso_639/sl.po
--- a/setup/iso_639/sr.po
+++ b/setup/iso_639/sr.po
--- a/setup/iso_639/sr@latin.po
+++ b/setup/iso_639/sr@latin.po
--- a/setup/iso_639/sv.po
+++ b/setup/iso_639/sv.po
--- a/setup/iso_639/ta.po
+++ b/setup/iso_639/ta.po
--- a/setup/iso_639/th.po
+++ b/setup/iso_639/th.po
--- a/setup/iso_639/ti.po
+++ b/setup/iso_639/ti.po
--- a/setup/iso_639/tig.po
+++ b/setup/iso_639/tig.po
--- a/setup/iso_639/tr.po
+++ b/setup/iso_639/tr.po
--- a/setup/iso_639/tt.po
+++ b/setup/iso_639/tt.po
--- a/setup/iso_639/uk.po
+++ b/setup/iso_639/uk.po
--- a/setup/iso_639/ve.po
+++ b/setup/iso_639/ve.po
--- a/setup/iso_639/vi.po
+++ b/setup/iso_639/vi.po
--- a/setup/iso_639/wa.po
+++ b/setup/iso_639/wa.po
--- a/setup/iso_639/xh.po
+++ b/setup/iso_639/xh.po
--- a/setup/iso_639/zh_CN.po
+++ b/setup/iso_639/zh_CN.po
--- a/setup/iso_639/zh_TW.po
+++ b/setup/iso_639/zh_TW.po
--- a/setup/iso_639/zu.po
+++ b/setup/iso_639/zu.po