Fixed #15237 (again). RSS feeds now include proper character encoding in the mimetype. Thanks shadow for the report and Michal Rzechonek for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17494 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/utils/feedgenerator.py

@@ -200,7 +200,7 @@ class Enclosure(object):
         self.url = iri_to_uri(url)
 
 class RssFeed(SyndicationFeed):
-    mime_type = 'application/rss+xml'
+    mime_type = 'application/rss+xml; charset=utf-8'
     def write(self, outfile, encoding):
         handler = SimplerXMLGenerator(outfile, encoding)
         handler.startDocument()

tests/regressiontests/utils/feedgenerator.py

@@ -87,6 +87,15 @@ class FeedgeneratorTest(unittest.TestCase):
             atom_feed.mime_type, "application/atom+xml; charset=utf-8"
         )
 
+    def test_rss_mime_type(self):
+        """
+        Test to make sure RSS MIME type has UTF8 Charset parameter set
+        """
+        rss_feed = feedgenerator.Rss201rev2Feed("title", "link", "description")
+        self.assertEqual(
+            rss_feed.mime_type, "application/rss+xml; charset=utf-8"
+        )
+
     # Two regression tests for #14202
 
     def test_feed_without_feed_url_gets_rendered_without_atom_link(self):