Ticket #4430: rss-unicode.patch

django/utils/feedgenerator.py

@@ -19 +19 @@
-"""
-
-from django.utils.xmlutils import SimplerXMLGenerator
+from django.utils.encoding import smart_unicode
-import datetime, re, time
-import email.Utils
-
@@ -157 +158 @@
-    def write_items(self, handler):
-        for item in self.items:
-            handler.startElement(u"item", {})
-item['title']
-item['link']
+smart_unicode(item['title'])
+smart_unicode(item['link'])
-            if item['description'] is not None:
-item['description']
-
+smart_unicode(item['description'])
+
-            # Author information.
-            if item["author_name"] and item["author_email"]:
-
-item['author_email'], item['author_name']
+u
+smart_unicode(item['author_email']), smart_unicode(item['author_name'])
-            elif item["author_email"]:
-item["author_email"]
+smart_unicode(item["author_email"])
-            elif item["author_name"]:
-item["author_name"]
-
+smart_unicode(item["author_name"])
+
-            if item['pubdate'] is not None:
-                handler.addQuickElement(u"pubDate", rfc2822_date(item['pubdate']).decode('ascii'))
-            if item['comments'] is not None:
-item['comments']
+smart_unicode(item['comments'])
-            if item['unique_id'] is not None:
-item['unique_id']
-
+smart_unicode(item['unique_id'])
+
-            # Enclosure.
-            if item['enclosure'] is not None:
-                handler.addQuickElement(u"enclosure", '',
-                    {u"url": item['enclosure'].url, u"length": item['enclosure'].length,
-                        u"type": item['enclosure'].mime_type})
-
+
-            # Categories.
-            for cat in item['categories']:
-cat
+smart_unicode(cat)
-
-            handler.endElement(u"item")
-
@@ -227 +228 @@
-    def write_items(self, handler):
-        for item in self.items:
-            handler.startElement(u"entry", {})
-item['title']
-item['link']
+smart_unicode(item['title'])
+smart_unicode(item['link'])
-            if item['pubdate'] is not None:
-                handler.addQuickElement(u"updated", rfc3339_date(item['pubdate']).decode('ascii'))
-
-            # Author information.
-            if item['author_name'] is not None:
-                handler.startElement(u"author", {})
-item['author_name']
+smart_unicode(item['author_name'])
-                if item['author_email'] is not None:
-item['author_email']
+smart_unicode(item['author_email'])
-                if item['author_link'] is not None:
-item['author_link']
+smart_unicode(item['author_link'])
-                handler.endElement(u"author")
-
-            # Unique ID.
-            if item['unique_id'] is not None:
-                unique_id = item['unique_id']
-            else:
-item['link'], item['pubdate']
+smart_unicode(item['link']), smart_unicode(item['pubdate'])
-            handler.addQuickElement(u"id", unique_id)
-
-            # Summary.
-            if item['description'] is not None:
-item['description']
+smart_unicode(item['description'])
-
-            # Enclosure.
-            if item['enclosure'] is not None:
-                handler.addQuickElement(u"link", '',
-                    {u"rel": u"enclosure",
-item['enclosure'].url
+smart_unicode(item['enclosure'].url)
-                     u"length": item['enclosure'].length,
-                     u"type": item['enclosure'].mime_type})
-
-            # Categories.
-            for cat in item['categories']:
-cat
+smart_unicode(cat)
-
-            # Rights.
-            if item['item_copyright'] is not None:
-item['item_copyright']
+smart_unicode(item['item_copyright'])
-
-            handler.endElement(u"entry")
-