Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Fixed #15237 -- Always set charset of Atom1 feeds to UTF-8. T…

…hanks, Simon and jasonkotenko.

Backport from trunk (r15505).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 6a438e2d1ab9bfdb2b4ae4cff121f812dd5fd241 1 parent 748110c
@jezdez jezdez authored
View
3  django/contrib/syndication/views.py
@@ -1,9 +1,8 @@
-import datetime
from django.conf import settings
from django.contrib.sites.models import get_current_site
from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
from django.http import HttpResponse, Http404
-from django.template import loader, Template, TemplateDoesNotExist, RequestContext
+from django.template import loader, TemplateDoesNotExist, RequestContext
from django.utils import feedgenerator, tzinfo
from django.utils.encoding import force_unicode, iri_to_uri, smart_unicode
from django.utils.html import escape
View
2  django/utils/feedgenerator.py
@@ -285,7 +285,7 @@ def add_item_elements(self, handler, item):
class Atom1Feed(SyndicationFeed):
# Spec: http://atompub.org/2005/07/11/draft-ietf-atompub-format-10.html
- mime_type = 'application/atom+xml'
+ mime_type = 'application/atom+xml; charset=utf8'
ns = u"http://www.w3.org/2005/Atom"
def write(self, outfile, encoding):
View
9 tests/regressiontests/utils/feedgenerator.py
@@ -61,3 +61,12 @@ def test_rfc3339_date_with_timezone(self):
"2008-11-14T13:37:00+02:00"
)
+ def test_atom1_mime_type(self):
+ """
+ Test to make sure Atom MIME type has UTF8 Charset parameter set
+ """
+ atom_feed = feedgenerator.Atom1Feed("title", "link", "description")
+ self.assertEqual(
+ atom_feed.mime_type, "application/atom+xml; charset=utf8"
+ )
+
Please sign in to comment.
Something went wrong with that request. Please try again.