Ticket #15237: 15237-reopened.patch

django/utils/feedgenerator.py

@@ -285 +285 @@
 
 class Atom1Feed(SyndicationFeed):
     # Spec: http://atompub.org/2005/07/11/draft-ietf-atompub-format-10.html
-    mime_type = 'application/atom+xml; charset=utf8'
+    mime_type = 'application/atom+xml; charset=utf-8'
     ns = u"http://www.w3.org/2005/Atom"
 
     def write(self, outfile, encoding):

tests/regressiontests/signing/tests.py

@@ -13 +13 @@
         for s in (
             'hello',
             '3098247:529:087:',
-            u'\u2019'.encode('utf8'),
+            u'\u2019'.encode('utf-8'),
         ):
             self.assertEqual(
                 signer.signature(s),

tests/regressiontests/utils/feedgenerator.py

@@ -66 +66 @@
         """
         atom_feed = feedgenerator.Atom1Feed("title", "link", "description")
         self.assertEqual(
-            atom_feed.mime_type, "application/atom+xml; charset=utf8"
+            atom_feed.mime_type, "application/atom+xml; charset=utf-8"
         )