diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-05-10 11:24:16 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-05-10 11:24:16 +0000 |
| commit | 8099fec855ca96728e8b90338619397851dfdd7d (patch) | |
| tree | 96dec5e50d6ac9af57e8684f8867986703b437fb | |
| parent | 868cf8093c63b3439e6534fe69e7050c4714770a (diff) | |
| download | django-8099fec855ca96728e8b90338619397851dfdd7d.tar.gz | |
[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
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admindocs/utils.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admindocs/utils.py b/django/contrib/admindocs/utils.py index 24228541f6..41c627cc4d 100644 --- a/django/contrib/admindocs/utils.py +++ b/django/contrib/admindocs/utils.py @@ -5,6 +5,7 @@ from email.Parser import HeaderParser 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 @@ def parse_rst(text, default_reference_context, thing_being_parsed=None): "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) |