From e55bbf4c3c42b17d52c21bc3a460b4981fdc190c Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 9 Sep 2011 18:34:33 +0000 Subject: [PATCH] Fixed #15237 -- Fixed a typo in specifying UTF-8 encoding in the feed generator and signing tests. Thanks, Aymeric Augustin. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16738 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/feedgenerator.py | 2 +- tests/regressiontests/signing/tests.py | 2 +- tests/regressiontests/utils/feedgenerator.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py index e23fde71ae..28a83f2f42 100644 --- a/django/utils/feedgenerator.py +++ b/django/utils/feedgenerator.py @@ -285,7 +285,7 @@ class Rss201rev2Feed(RssFeed): 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): diff --git a/tests/regressiontests/signing/tests.py b/tests/regressiontests/signing/tests.py index 0b0cacf10e..a9065131da 100644 --- a/tests/regressiontests/signing/tests.py +++ b/tests/regressiontests/signing/tests.py @@ -13,7 +13,7 @@ class TestSigner(TestCase): for s in ( 'hello', '3098247:529:087:', - u'\u2019'.encode('utf8'), + u'\u2019'.encode('utf-8'), ): self.assertEqual( signer.signature(s), diff --git a/tests/regressiontests/utils/feedgenerator.py b/tests/regressiontests/utils/feedgenerator.py index 26c60ea420..bcb4286e89 100644 --- a/tests/regressiontests/utils/feedgenerator.py +++ b/tests/regressiontests/utils/feedgenerator.py @@ -66,6 +66,6 @@ class FeedgeneratorTest(unittest.TestCase): """ 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" )