Django

Code

Show
Ignore:
Timestamp:
07/07/07 08:23:57 (2 years ago)
Author:
mtredinnick
Message:

newforms-admin: Merged from trunk up to [5625]. This includes the Unicode
merge, however, not all of admin/ (and none of admindocs/) has been ported and
checked yet.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-5595 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-5625

  • django/branches/newforms-admin/django/contrib/sitemaps/views.py

    r5195 r5627  
    33from django.contrib.sites.models import Site 
    44from django.core import urlresolvers 
     5from django.utils.encoding import smart_str 
    56 
    67def index(request, sitemaps): 
    …… 
    2728        else: 
    2829            urls.extend(site.get_urls()) 
    29     xml = loader.render_to_string('sitemap.xml', {'urlset': urls}) 
     30    xml = smart_str(loader.render_to_string('sitemap.xml', {'urlset': urls})) 
    3031    return HttpResponse(xml, mimetype='application/xml')