From 6ede52c40dd17aa85834f66cf0c562d50a4f47c6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Sep 2015 08:52:32 +0530
Subject: [PATCH] Update Telam

Fixes #1499844 [Updated recipe for Telam](https://bugs.launchpad.net/calibre/+bug/1499844)
---
 recipes/icons/telam.png | Bin 1951 -> 594 bytes
 recipes/telam.recipe    |  42 ++++++++++++++--------------------------
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/recipes/icons/telam.png b/recipes/icons/telam.png
index d75142ed056b9c80a457dd319984c084caf1d3a6..8295ee67413f673aae517d901978d691bacb9ada 100644
GIT binary patch
literal 594
zcmV-Y0<HatP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-w7EJECpKvC|Cdh0pCeP
zK~y-))swwzQ&9lL&%N*7`#$pe@){FkVth?QtU*dK8Kg)DaS$uGI7&xH@eior<m%el
zNkPy~3QC9yf*%!BN+nil9kfZC589Zdd3hh#$%0#@Ab9rQIdBe#NGS;pAc_O(-x@R~
zZ_p!8n_B8gbB|+x0Z+6!KX3NkT+h(%19%MpWIrV~Cg)G?f-aP)ar)l$6#G0|{N_cp
zISKiW?jyO>1HDtxteK_bW7?sQ>n!?gIS<djMSvJfTziz&2g3`YlRQU;{@qJUD{pW9
z_-^(=GdmzxTf(^beB80xvn9xh6t*9{f|Ie4qd_Om2uNzaa$AJqbv2ZX_1#W%qxGq<
z-7}qJG$W73>~=m4_gEah&JhfK!1Ez=4$hPT=gI;TbXe6jxiw-Z(n4@cEoG-`oT14T
z2%&&81%gWOAb_ee3<4L@4-v8KuY{17%1_%_i5r7AQPL=AMkJ;gI@dG-UE?rx4wWfT
zC=hrq)~d@`|4_yWS*hm^%ek(|SN2wTv3SZ_T+LtZ@v$qa5k1q9qeeFzg*(`V8P;I9
zYsi`PjTxt2K097}NPx#EZu)=BDBmaPmzHH$n|9h1{**$(EC7tCUe{p$Y9X;x1+azU
gX8$)s{{J)m0=<Q`6JBZU+W-In07*qoM6N<$f}ukI#{d8T

literal 1951
zcmV;Q2VnS#P)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{000MONkl<Zc-pm=
z2Z$V19LE3u_ujPadza06&Ar4+j5#$n?25fBqJkibh=>J61Q0|46jVe&K>-C3L<B)B
z*cEKV9%C*h#v~>&m%Ciu+cG=#RaZPB))UYV<_$9p^LyX>-V7faW8nW3f&W<ymXa|>
z14s!506_v_76F3z9{{v5ewc2p&rkTl?%C9psQ^*6pq$NBikVe|!^`s)E=6L0H|usF
z-v4gwy}8bG6mZ|{N<=m7o_SV<%r4|}yl8!Q>59t5Cmp{m>-_`ZFGAMFyfZ%Y!TK-1
ziHnhJ*6o84{hA2&y0#am&6M}W4WG!og1#hV<<h-po_@l*HH%i31VqNX`q?)x>|AK7
zOwO_QX_q^D($G;BUl!D71t3B;u(cwL0tz96#^F|U<r!z(aNcQ%xWp2L#=Q0I?iaW3
z4YEU14okvlbvC%PZ|xCTyQfrOG-CjSOm{SAc24~?wrR%}L`9u#kWPH|rN!{tvra|C
ze{wK3KK1bDJ3kGaVTW9KaOvdZYKLarGFe<X&;p2cU}tj;yXT_kKmX#TjT?MFD3<%4
zz3S{!k6iP&fEhn}^sCL!P1J83T7CNw)uC!03`l8GqC-Vwno@&G2>?S0aU3T@l<j1|
z=$U%^!Pnn>XVd1jwc0bc-mpBE`wKvKeC>zn2R{A$>UG0+9DB5_<W!sQRJ<NpTau}*
zes40fuSc0!B`oe_QRee_`KrUt8eKsU!zi+|*_Ypb?}^VhTzC43x14)6BK|Rh=^$P|
z_Wd0rhg^B|5u5kbKWMdf)N!LiK`KtBYyydy>ZGhEyy{9uf;l$3U-A5DYibt3r`}#a
zJWxqSj;iiY*YDnc(Q(a#%jE+M^6T{X`|X@7)~!C|>5s?m-njS4y?mp|4CX3579IAO
z1uDziM0zDPhcbhf*T@ggwf2D4gphi(ao>xt-S_6kchl0>*1#)2`4O1k{fmTBjfUS_
z?SJf}PhM!n)6^cZVoy4O=xA%c;Zw?#hb50l0m_BxLc$Yd`x>)Ngsv_aT{)SuDStk3
z>^*GRBb#?W{^8~(7si+a4xrsiH|&`FCQ{0Hpt{Jcwu8{5TtGFPPF1e$1a{JJlRN<3
z-}RKHrc*+t!KgyH7?QX`3A2?kYA(({IcdHaZ|MU7&}Oa`d=d(mlvFeFq*&mo^o21b
z7tL(by1-i{KMV;brmdBsiDjt;ZhTG%AaxxVQcBW9c6l~89-Rr{jqQ_(P>TSr<<{n;
zN@bhWsn;m+xQZQ$CJ90sbR(|UnVIhxVHhU!KvYi8p>`={kV01xIAHNvPyh_H2hsz~
z?7*l6+89F?H!BE3eOHx=DdnaU1|(_4gU#7CO-v|DQ-QIB*YYK1;<m^{!eX3@1Q~!%
zZ54yCD!?p)Kth1-sC87xXo85p01&}p1urr=IWwO^*BT}5GT+l=!nA!s%G8?5Mlm6h
z#HmGt78vl6aA8vbzz#QHNuLl<S&#%kffe=SfD&B%4j3WJGsKT$ZMzxj+XUUTI005c
zOBv>o>}8?t)3)NOtm9TBLxVM$bhP0{1F_<TDL^Z0@knVwDL4^^$x*qkA+rdu7+W_q
zQu*pfOcPD8rCrCQ%NaJq)U#;b59h!kVJmA}3yM=fYGB4zs~now8h~z?nPm<(mF+qJ
zr~%MOHe5Q$qHHl_g1EA8S*?(@h3F8-CvB;kkx5iUiox7AVfO|dVY4VrIq+17x<qV8
z%WErKW+}<P7#}Zj+hp?zDu^Ala7`u|t!5~~A^;Irlyj%7=np!xrBpS5aY#FnG>Mos
z@oHY5w*nDCB*6%!FfPh?m(Z*G3yhL!juUgUb+?F4g;5WPZNlKfwY60}IYj)eRb)Kp
zoZ}8F<O|S_Tqy<8ez`!?fT!8nn1U7qzHhX~B!W;&866x<j+T}&LbrbV*?3|>PaexT
zj9oP55Zk+SFq>!i$J%oAz~Ggmt9PlkYKGo|oJc)sa|jlyCWw79!Hk>C7b0y$vLM4g
zmaJTRSd8%U*V~(<1S+qYr6BBPb@STFY5f(%KLK3NzW$8kt{E=Jc9g1!m^SzvY%v)d
zD{bdRdr~<IQV@c@A{kjZI#TksZu{x=U5#q71hwVZhBEW->=!q$8Dfn7b@3XgRPVav
z;#ED%Se#%er0D3DA`mB1P6*n^gAQ6uYnDcrov@Aoef;IOgv!hns{oGcrKb%zH=TS!
zA?Ga7Dt_3x<DL)3HtyOcVjX8Pc@0_%0K0|Rg3}EA<ow=)9=h$i*FGJ)|I<%+&(Sbg
zs{vkpSn>8_hWZ>tBufB{F;ng6%`d)wanq(Rr)IOns&Knm$aa8sV_%zbZaMedz4iUi
ztpCz43=AE*?xeoL6)OkN87kN|E?rxG!)UX8dgj|LTRtA2-nFx_Rka20tRmJCwH1YO
z?*eZP_6!_)$mmF|uqNa6X6+?<(cei)8E_HCJQ94q8B#6!dkV~T9g8Yv7j26n9C-B-
lfF*U{Nkshh68}X7{u$8KLdb3Qc~k%Z002ovPDHLkV1nV2vI_tJ

diff --git a/recipes/telam.recipe b/recipes/telam.recipe
index c2dbfee1d7..838a57e885 100644
--- a/recipes/telam.recipe
+++ b/recipes/telam.recipe
@@ -1,5 +1,5 @@
 __license__   = 'GPL v3'
-__copyright__ = '2012, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2012-2015, Darko Miletic <darko.miletic at gmail.com>'
 '''
 www.telam.com.ar
 '''
@@ -15,12 +15,13 @@ class Telam(BasicNewsRecipe):
     oldest_article        = 2
     max_articles_per_feed = 200
     no_stylesheets        = True
-    encoding              = 'utf8'
+    encoding              = 'windows-1252'
     use_embedded_content  = False
     language              = 'es_AR'
     remove_empty_feeds    = True
+    auto_cleanup          = True
     publication_type      = 'newsportal'
-    masthead_url          = 'http://www.telam.com.ar/front/imagenes/encabezado/logotelam.jpg'
+    masthead_url          = 'http://www.telam.com.ar/img/logo_small.png'
     extra_css             = """
                                body{font-family: Arial,Helvetica,sans-serif }
                                img{margin-bottom: 0.4em; display:block}
@@ -33,30 +34,15 @@ class Telam(BasicNewsRecipe):
                         , 'language'  : language
                         }
 
-    remove_tags        = [dict(name=['meta','link'])]
-    remove_tags_before = dict(attrs={'class':'nota_fecha'})
-    remove_tags_after  = dict(attrs={'class':'nota_completa'})
-    remove_attributes  = ['lang']
-
-
     feeds = [
-              (u'Ultimas noticias', u'http://www.telam.com.ar/xml/rss/' )
-             ,(u'Politica'        , u'http://www.telam.com.ar/xml/rss/1')
-             ,(u'Economia'        , u'http://www.telam.com.ar/xml/rss/2')
-             ,(u'Sociedad'        , u'http://www.telam.com.ar/xml/rss/3')
-             ,(u'Policiales'      , u'http://www.telam.com.ar/xml/rss/4')
-             ,(u'Internacionales' , u'http://www.telam.com.ar/xml/rss/6')
-             ,(u'Espectaculos'    , u'http://www.telam.com.ar/xml/rss/7')
-             ,(u'Cultura'         , u'http://www.telam.com.ar/xml/rss/8')
-             ,(u'Deportes'        , u'http://www.telam.com.ar/xml/rss/9')
-             ,(u'Telam Investiga' , u'http://www.telam.com.ar/xml/rss/5')
+              (u'Ultimas noticias', u'http://www.telam.com.ar/rss2/ultimasnoticas.xml' )
+             ,(u'Politica'        , u'http://www.telam.com.ar/rss2/politica.xml'       )
+             ,(u'Economia'        , u'http://www.telam.com.ar/rss2/economia.xml'       )
+             ,(u'Sociedad'        , u'http://www.telam.com.ar/rss2/sociedad.xml'       )
+             ,(u'Policiales'      , u'http://www.telam.com.ar/rss2/policiales.xml'     )
+             ,(u'Internacionales' , u'http://www.telam.com.ar/rss2/mundo.xml'          )
+             ,(u'Espectaculos'    , u'http://www.telam.com.ar/rss2/espectaculos.xml'   )
+             ,(u'Cultura'         , u'http://www.telam.com.ar/rss2/cultura.xml'        )
+             ,(u'Deportes'        , u'http://www.telam.com.ar/rss2/deportes.xml'       )
+             ,(u'Opinion'         , u'http://www.telam.com.ar/rss2/opinion.xml'        )
             ]
-
-    def print_version(self, url):
-        artid = url.rpartition('/')[2]
-        return 'http://www.telam.com.ar/?codProg=imprimir-nota&id=' + artid
-
-    def preprocess_html(self, soup):
-        for item in soup.findAll(style=True):
-            del item['style']
-        return soup