iSubtle bugs now resolved. - zs - Zeitungsschau rss to email converter Err gopher.r-36.net 70 i Err gopher.r-36.net 70 1Log /scm/zs//log.gph gopher.r-36.net 70 1Files /scm/zs//files.gph gopher.r-36.net 70 1Refs /scm/zs//refs.gph gopher.r-36.net 70 1LICENSE /scm/zs//file/LICENSE.gph gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1commit 96b774b6b2233be6b3959e9ceceacdcc91463105 /scm/zs//commit/96b774b6b2233be6b3959e9ceceacdcc91463105.gph gopher.r-36.net 70 1parent da06d30ff47031e7ddf40b37d841586ac9bd9c48 /scm/zs//commit/da06d30ff47031e7ddf40b37d841586ac9bd9c48.gph gopher.r-36.net 70 hAuthor: Christoph Lohmann <20h@r-36.net> URL:mailto:20h@r-36.net gopher.r-36.net 70 iDate: Tue, 23 May 2017 21:02:14 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iSubtle bugs now resolved. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i zeitungsschau/feed.py | 8 ++++---- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i1 file changed, 4 insertions(+), 4 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/zeitungsschau/feed.py b/zeitungsschau/feed.py /scm/zs//file/zeitungsschau/feed.py.gph gopher.r-36.net 70 i@@ -40,7 +40,7 @@ def parsexml(astr): Err gopher.r-36.net 70 i # Throw XML parsing errors so we can blame the feed authors. Err gopher.r-36.net 70 i return xml Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-def parsejson(astr): Err gopher.r-36.net 70 i+def parsejsonfeed(astr): Err gopher.r-36.net 70 i js = json.loads(astr) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i feed = {} Err gopher.r-36.net 70 i@@ -119,7 +119,7 @@ def parsejson(astr): Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i return feed Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-def parseatom(astr): Err gopher.r-36.net 70 i+def parseatomfeed(astr): Err gopher.r-36.net 70 i xml = parsexml(astr) Err gopher.r-36.net 70 i if xml == None: Err gopher.r-36.net 70 i return None Err gopher.r-36.net 70 i@@ -372,7 +372,7 @@ def fetch(uri): Err gopher.r-36.net 70 i ftype = "json" Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if ftype == "xml": Err gopher.r-36.net 70 i- return (rcode, parsexml(fval)) Err gopher.r-36.net 70 i+ return (rcode, parseatomfeed(fval)) Err gopher.r-36.net 70 i else: Err gopher.r-36.net 70 i- return (rcode, parsejson(fval.decode("utf-8"))) Err gopher.r-36.net 70 i+ return (rcode, parsejsonfeed(fval.decode("utf-8"))) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 .