Author: jezdez
Date: 2010-05-10 06:24:16 -0500 (Mon, 10 May 2010)
New Revision: 13194
Modified:
django/branches/releases/1.1.X/django/contrib/admindocs/utils.py
Log:
[1.1.X] Fixed #12892 - Fixed unicode related bug in a utility function of the
admindocs app that prevented it to be used in non-English environments together
with certain versions of docutils.
Backport from trunk, r13192
Modified: django/branches/releases/1.1.X/django/contrib/admindocs/utils.py
===================================================================
--- django/branches/releases/1.1.X/django/contrib/admindocs/utils.py
2010-05-10 11:23:59 UTC (rev 13193)
+++ django/branches/releases/1.1.X/django/contrib/admindocs/utils.py
2010-05-10 11:24:16 UTC (rev 13194)
@@ -5,6 +5,7 @@
from email.Errors import HeaderParseError
from django.utils.safestring import mark_safe
from django.core.urlresolvers import reverse
+from django.utils.encoding import smart_str
try:
import docutils.core
import docutils.nodes
@@ -64,7 +65,7 @@
"link_base" : reverse('django-admindocs-docroot').rstrip('/')
}
if thing_being_parsed:
- thing_being_parsed = "<%s>" % thing_being_parsed
+ thing_being_parsed = smart_str("<%s>" % thing_being_parsed)
parts = docutils.core.publish_parts(text, source_path=thing_being_parsed,
destination_path=None, writer_name='html',
settings_overrides=overrides)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
