File venus-Non-ascii_feed_titles.patch of Package venus

Overview Repositories Revisions Requests Users Attributes Meta

File venus-Non-ascii_feed_titles.patch of Package venus

Index: venus/planet/reconstitute.py
===================================================================
--- venus.orig/planet/reconstitute.py
+++ venus/planet/reconstitute.py
@@ -75,7 +75,7 @@ def id(xentry, entry):
         entry_id = entry.link
     elif entry.has_key("title") and entry.title:
         entry_id = (entry.title_detail.base + "/" +
-            md5(entry.title).hexdigest())
+            md5(entry.title.encode('utf-8')).hexdigest())
     elif entry.has_key("summary") and entry.summary:
         entry_id = (entry.summary_detail.base + "/" +
             md5(entry.summary).hexdigest())
Index: venus/planet/spider.py
===================================================================
--- venus.orig/planet/spider.py
+++ venus/planet/spider.py
@@ -230,7 +230,7 @@ def writeCache(feed_uri, feed_info, data
 
         # apply any filters
         xdoc = reconstitute.reconstitute(data, entry)
-        output = xdoc.toxml().encode('utf-8')
+        output = xdoc.toxml("utf-8")
         xdoc.unlink()
         for filter in config.filters(feed_uri):
             output = shell.run(filter, output, mode="filter")
@@ -291,7 +291,7 @@ def writeCache(feed_uri, feed_info, data
     xdoc=minidom.parseString('''<feed xmlns:planet="%s"
       xmlns="http://www.w3.org/2005/Atom"/>\n''' % planet.xmlns)
     reconstitute.source(xdoc.documentElement,data.feed,data.bozo,data.version)
-    write(xdoc.toxml().encode('utf-8'), filename(sources, feed_uri))
+    write(xdoc.toxml("utf-8"), filename(sources, feed_uri))
     xdoc.unlink()
 
 def httpThread(thread_index, input_queue, output_queue, log):
Index: venus/tests/data/reconstitute/title_nonascii.xml
===================================================================
--- /dev/null
+++ venus/tests/data/reconstitute/title_nonascii.xml
@@ -0,0 +1,10 @@
+
+
+<feed xmns="http://www.w3.org/2005/Atom">
+  <entry>
+    <title xml:lang="en-us">foo æøå. French: êèé </title>
+  </entry>
+</feed>

Places

File venus-Non-ascii_feed_titles.patch of Package venus

Places