  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.utils import feedgenerator, tzinfo
  from django.utils.encoding import force_unicode, iri_to_uri, smart_unicode
  from django.utils.html import escape
  
  def add_domain(domain, url, secure=False):
 
</s> remove import datetime
 </s> add  </s> remove     mime_type = 'application/atom+xml'
 </s> add     mime_type = 'application/atom+xml; charset=utf8'
from django.template import loader, TemplateDoesNotExist, RequestContext
  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, 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
  
  def add_domain(domain, url, secure=False):
keep keep keep keep replace keep keep keep keep keep
 Fixed #15237 -- Always set charset of Atom1 feeds to UTF-8. Thanks, Simon and jasonkotenko.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15505 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/contrib/syndication/views.py