iShow the UUID and allow short date formats. - 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 ab6251f24a30cfb463c0317871529e66ea56079d /scm/zs//commit/ab6251f24a30cfb463c0317871529e66ea56079d.gph gopher.r-36.net 70 1parent 74bbbf2cf552994fee7bd10709f9b955d59ebe81 /scm/zs//commit/74bbbf2cf552994fee7bd10709f9b955d59ebe81.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, 21 Mar 2017 21:47:22 +0100 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iShow the UUID and allow short date formats. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i zeitungsschau/feed.py | 1 + Err gopher.r-36.net 70 i zeitungsschau/feedemail.py | 2 ++ Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i2 files changed, 3 insertions(+), 0 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@@ -50,6 +50,7 @@ def parse(astr): Err gopher.r-36.net 70 i isrss = False Err gopher.r-36.net 70 i isrdf = False Err gopher.r-36.net 70 i now = datetime.now(pytz.utc) Err gopher.r-36.net 70 i+ now = now.replace(hour=20, minute=20, second=20, microsecond=20) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if hasattr(xml, "channel"): Err gopher.r-36.net 70 i if hasattr(xml, "item"): Err gopher.r-36.net 70 1diff --git a/zeitungsschau/feedemail.py b/zeitungsschau/feedemail.py /scm/zs//file/zeitungsschau/feedemail.py.gph gopher.r-36.net 70 i@@ -95,6 +95,8 @@ def send(feed, to, smtphost="localhost", smtpport=None, ssl="False",\ Err gopher.r-36.net 70 i msg["X-RSS-Feed"] = feed["link"] Err gopher.r-36.net 70 i if "id" in article: Err gopher.r-36.net 70 i msg["X-RSS-ID"] = article["id"] Err gopher.r-36.net 70 i+ if "uuid" in article: Err gopher.r-36.net 70 i+ msg["X-RSS-UUID"] = article["uuid"] Err gopher.r-36.net 70 i if "tags" in article: Err gopher.r-36.net 70 i msg["X-RSS-TAGS"] = Header(",".join(article["tags"]),\ Err gopher.r-36.net 70 i "utf-8") Err gopher.r-36.net 70 .