From e0128dd60d687c7abb125e5835035374507c63a9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 30 Oct 2017 22:05:46 +0530
Subject: [PATCH] Update Tulsa World

Fixes #1720016 [Tulsa World English News Source does not work](https://bugs.launchpad.net/calibre/+bug/1720016)
---
 recipes/icons/tulsaworld.png | Bin 969 -> 880 bytes
 recipes/tulsaworld.recipe    |  26 ++++++++++----------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/recipes/icons/tulsaworld.png b/recipes/icons/tulsaworld.png
index a66b778bc0b3c9c6ba6c02207764dc8a1504a33f..4b85d349724cd0a7cf40c28aa479ab06fbc62022 100644
GIT binary patch
delta 868
zcmV-q1DpKG2k-`v8Gi-<001BJ|6u?C010qNS#tmY4#WTe4#WYKD-Ig~000tnMObuS
zabIa;Z%=Y*XGCRibZ7uGGS%X^>;M1*1W80eR5*>Lk=<)s1sKMECnxEWoP2+@u`y}7
zFV<~Z*kmmt3L+I|FXoMN7rWRh$fo!Y_$LVNX2K9eyiq2Mxqs>E#BQ`&S4UgYu1ULe
zGilN^X__`kPm+`G6R%R(m{<O;US6K(;ekis1q4@u0Z|o4m4@b(a7tDWJ9NR@^P$^c
zd~#v)d9C>TBbk*Ci)!JsM0Rs*B`3bA6tgF6lI2)2U$n$5$0NC=N%=nmZiLF0-P-7_
zwXM6auVmJ(l7CUs7}bd8L8RmeCe$|udkq&g_P$tZWj5ULXgbH&4|Xp4>l0r!64$#T
z$#HsoFZ1d_AAe;G+*}YSw?yWabGD}1b=`aF^yo7UZU*y#ez)NluT;`Gg%bMiBlOt)
zWOf{QOoMpM0{_G^%&n$DZ6Rl~Z=XEm{x+FRR<r=&t$*@ZwWTvoZlpL95c%-C{nUza
zOu9|vl7sZdI@A<gHVHXjMrSa3oX+|Oz%>yd7dZFjolwaWO6_7YKf-1lKxmuEm3E<7
zqSs+%pI*ScuZ2)ABWdeYtJ|7PV*Ps!fUn!+Kj_wwFSxmK?_I2x3Lm}Wq0#bSmkgX8
z?&0iEFMo2iNtaeY*KU$3XkP=+0&K}j{g~HGpWOj!i{BRul;s+qj<h)1-6Wo#XXZ%(
zooGY?+!m4bXhYcxFsYU0*;U0ebjXR-EHXN1qufv#=(W&qv0+r5v;q?}OAE}#RGw^C
zP^*>6y&2y><^Ca^%~Pu=^jSqtc#WJMuwoKb{(lVp&ErIb@%ca4e)=mz&N;kxa5)S&
z00e+`yKTI1b$Z_Kl8zj3=_x8ThW0y%Cqw-F+vfz=7BHw<y6HhK_OldiOy}Yc-vU%E
zfFKA;ESW!d>DtuPk2{LxWWSY{bPAfbg^}YQ<I~?^ac!Bkn1svhOsTsM&jadSgAU<%
z`d#Qx_aA*Tu@D~~_DNLREvg%HG)k+?L@T7@%?Vq(Fcyu56CKYp0UgHgO^w{23BC6;
u9{1O`AFE3-IqER!Z!J#Woqm!2fAKFSRa5V3Tp0HN0000<MNUMnLSTX+@1cqS

delta 958
zcmV;v13~=o2FVAI8Gi!+001a04^sdD0&q}FR7C&)01F*76eKeiC_oM*Ln1LpBQr%L
zG)o~jQ!71DFg{2$LQ^wBS20CfDLr8+LuM;OXe>o*B13c|MtU1Ve;Z4V7)_EORF)@H
zjxbY)GgE#pRedT=d@)RRI$DHASaMKbZCPYyQCnU`PFqGxQ-4ZROha8rRa{3|WH(Sx
zElEx%Mp7n2Qy@K0Aw5kTL`)q+L?tgbG%PbWB{e=DEiEBDW<gM9RcV1sZkj=IoIYrn
zIA@wQYnV4`l`(9dIBudiX`(D+sVZQgBwU;^U7Im!wmNXPJ#n=^a=AlwxIcEiI&-~F
zfWuFJ!c~L8R)2)RU5C75inwT$%Wap<bD7M0q0oP$(SfAWimKF#tJROL)r+v-mbKfS
zw%4G#(wn=^ow>)Huf>|Fy_&PPrL?rLy{NIovbny&v%bT%yvDP+#kIW3w7<->#>l(J
z$-2kG#>dFY(Z<8l#naZq(9zP%+1bj|;Kb15z|7yh&VSdq&FaI@?a<!j)8Oaj>F)6G
z@bvWc^7Z)l`T6?)`u_g?{{8;{|Nrm$|LgPp*y#M_?Azw-)7j*_*Vn7f&!Wo6o4?4M
zyuzNq)2Yqbo!7~d+slT=zH+a=dz!6+nWcu4or9ULk)ySfs<WM>o|}`Lr;nVjjGC^J
zps|{wt$&iUs)n1SdX%7cn4Er&qi&C-d6Kh!m$#6hzKo^DiloM%v(cuv(XPPSpugW}
zm(yaD(^rbjPJysVgRf3_s#bfdS9+*cdYxEyomh37RCb+7dY5E@dvJV=ae<S0f{TBI
ziGqcNdYyx9kC23xZ-{_hgnVFme_DBeQ+9u4n18QQ@7$}%9J!nT0004WQchC<K<3zH
z00038Nkl<Zc-mvY0Ih9pZOz@O@hN$ki*kT$28Ond+TQ7N(q<gD-EDrb9wbmXW!kw(
zT}$j7_R8`e0SdI&oS!<mr?h(QDoG)J<`M>m&P{#&+xA;}xQL3#n6eyYVA$eyY__|T
zjeoPan1q}FrxF9hRyX_QMRAVSyVh7p336~TFhu+Nx^7PhT)Awim9V@r8w11U;F!>$
zkmLyyPaKfuV`XPx@b(K2i-^oEE}VN>&6v@Qfx*W!Dz>6Lf99;Sy7~r8^BEYb0yeJS
zP?m8<M^9VRh`Ryk(ses_uFlSycTz*kP&XwV<n+eGJ^L0cJbX&sgr@-LxfY-g>ylO+
gQdCt~+yrC;0G_a3k*LpU<^TWy07*qoM6N<$f~c14uK)l5

diff --git a/recipes/tulsaworld.recipe b/recipes/tulsaworld.recipe
index c487afe526..583a940aae 100644
--- a/recipes/tulsaworld.recipe
+++ b/recipes/tulsaworld.recipe
@@ -1,5 +1,8 @@
+# -*- mode: python -*-
+# -*- coding: utf-8 -*-
+
 __license__ = 'GPL v3'
-__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2010-2017, Darko Miletic <darko.miletic at gmail.com>'
 '''
 tulsaworld.com
 '''
@@ -19,27 +22,18 @@ class TulsaWorld(BasicNewsRecipe):
     use_embedded_content = False
     language = 'en'
     country = 'US'
+    auto_cleanup=True
     remove_empty_feeds = True
-    masthead_url = 'http://www.tulsaworld.com/images/TW_logo-blue-footer.jpg'
+    masthead_url = 'https://bloximages.newyork1.vip.townnews.com/tulsaworld.com/content/tncms/custom/image/cfd1ce2e-7ec7-11e7-b919-8754a2b60fa6.png?_dc=1502478231'
     extra_css = ' body{font-family: Arial,Verdana,sans-serif } img{margin-bottom: 0.4em} .articleHeadline{font-size: xx-large; font-weight: bold} .articleKicker{font-size: x-large; font-weight: bold} .articleByline,.articleDate{font-size: small} .leadp{font-size: 1.1em} '  # noqa
 
     conversion_options = {
-        'comment': description, 'publisher': publisher, 'language': language, 'linearize_tables': True
+        'comment': description, 'publisher': publisher, 'language': language
     }
-    keep_only_tags = [dict(name='div', attrs={'id': [
-                           'ctl00_body1_ArticleControl_divArticleText', 'ctl00_BodyContent_ArticleControl_divArticleText']})]
 
     feeds = [
-
-    (u'News', u'http://www.tulsaworld.com/site/rss.aspx?group=1'),
-    (u'Business', u'http://www.tulsaworld.com/site/rss.aspx?group=5'),
-    (u'Opinion', u'http://www.tulsaworld.com/site/rss.aspx?group=7')
+    (u'News', u'http://www.tulsaworld.com/search/?f=rss&t=article&c=news&l=150&s=start_time&sd=desc'),
+    (u'Business', u'http://www.tulsaworld.com/search/?f=rss&t=article&c=business&l=150&s=start_time&sd=desc'),
+    (u'Opinion', u'http://www.tulsaworld.com/search/?f=rss&t=article&c=opinion&l=150&s=start_time&sd=desc')
     ]
 
-    def get_article_url(self, article):
-        return article.get('link',  None).rpartition('&rss')[0]
-
-    def preprocess_html(self, soup):
-        for item in soup.findAll(style=True):
-            del item['style']
-        return self.adeify_images(soup)