Author: jezdez
Date: 2011-09-09 11:34:33 -0700 (Fri, 09 Sep 2011)
New Revision: 16738

Modified:
   django/trunk/django/utils/feedgenerator.py
   django/trunk/tests/regressiontests/signing/tests.py
   django/trunk/tests/regressiontests/utils/feedgenerator.py
Log:
Fixed #15237 -- Fixed a typo in specifying UTF-8 encoding in the feed generator 
and signing tests. Thanks, Aymeric Augustin.

Modified: django/trunk/django/utils/feedgenerator.py
===================================================================
--- django/trunk/django/utils/feedgenerator.py  2011-09-09 18:34:24 UTC (rev 
16737)
+++ django/trunk/django/utils/feedgenerator.py  2011-09-09 18:34:33 UTC (rev 
16738)
@@ -285,7 +285,7 @@
 
 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):

Modified: django/trunk/tests/regressiontests/signing/tests.py
===================================================================
--- django/trunk/tests/regressiontests/signing/tests.py 2011-09-09 18:34:24 UTC 
(rev 16737)
+++ django/trunk/tests/regressiontests/signing/tests.py 2011-09-09 18:34:33 UTC 
(rev 16738)
@@ -13,7 +13,7 @@
         for s in (
             'hello',
             '3098247:529:087:',
-            u'\u2019'.encode('utf8'),
+            u'\u2019'.encode('utf-8'),
         ):
             self.assertEqual(
                 signer.signature(s),

Modified: django/trunk/tests/regressiontests/utils/feedgenerator.py
===================================================================
--- django/trunk/tests/regressiontests/utils/feedgenerator.py   2011-09-09 
18:34:24 UTC (rev 16737)
+++ django/trunk/tests/regressiontests/utils/feedgenerator.py   2011-09-09 
18:34:33 UTC (rev 16738)
@@ -66,6 +66,6 @@
         """
         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"
         )
 

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to