iIn case there is no pubdate, don't add it to the uuid. - 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 a8d6277ef2b6adfd085a13ac1d01bd0a054a47a7 /scm/zs//commit/a8d6277ef2b6adfd085a13ac1d01bd0a054a47a7.gph gopher.r-36.net 70 1parent bea5daebe99ff92fffec41f86332fc3b3621162e /scm/zs//commit/bea5daebe99ff92fffec41f86332fc3b3621162e.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, 29 Apr 2014 18:33:48 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iIn case there is no pubdate, don't add it to the uuid. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i feed.py | 10 +++++++--- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i1 file changed, 7 insertions(+), 3 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/feed.py b/feed.py /scm/zs//file/feed.py.gph gopher.r-36.net 70 i@@ -45,6 +45,7 @@ def parse(astr): Err gopher.r-36.net 70 i articles = [] 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() 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 i@@ -69,7 +70,7 @@ def parse(astr): Err gopher.r-36.net 70 i elif hasattr(xml, "lastBuildDate"): Err gopher.r-36.net 70 i feed["updated"] = parseiso(xml.lastBuildDate) Err gopher.r-36.net 70 i else: Err gopher.r-36.net 70 i- feed["updated"] = datetime.now() Err gopher.r-36.net 70 i+ feed["updated"] = now Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if hasattr(xml, "link"): Err gopher.r-36.net 70 i if "href" in xml.link.attrib: Err gopher.r-36.net 70 i@@ -145,7 +146,7 @@ def parse(astr): Err gopher.r-36.net 70 i elif hasattr(entry, "date"): Err gopher.r-36.net 70 i article["updated"] = parseiso(entry.date) Err gopher.r-36.net 70 i else: Err gopher.r-36.net 70 i- article["updated"] = datetime.now() Err gopher.r-36.net 70 i+ article["updated"] = now Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i # author Err gopher.r-36.net 70 i if hasattr(entry, "author"): Err gopher.r-36.net 70 i@@ -183,7 +184,10 @@ def parse(astr): Err gopher.r-36.net 70 i else: Err gopher.r-36.net 70 i article["id"] = article["text"][:30] Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- article["uuid"] = "%s" % (article["updated"]) Err gopher.r-36.net 70 i+ if article["updated"] == now: Err gopher.r-36.net 70 i+ article["uuid"] = "" Err gopher.r-36.net 70 i+ else: Err gopher.r-36.net 70 i+ article["uuid"] = "%s" % (article["updated"]) Err gopher.r-36.net 70 i for e in ("id", "title", "file"): Err gopher.r-36.net 70 i if e in article: Err gopher.r-36.net 70 i article["uuid"] = "%s-%s" % \ Err gopher.r-36.net 70 .