← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal-security

« back to all changes in this revision

Viewing changes to django/contrib/admindocs/utils.py

  • Committer: Bazaar Package Importer
  • Author(s): Chris Lamb
  • Date: 2010-05-21 07:52:55 UTC
  • mfrom: (1.3.6 upstream)
  • mto: This revision was merged to the branch mainline in revision 28.
  • Revision ID: james.westby@ubuntu.com-20100521075255-ii78v1dyfmyu3uzx
Tags: upstream-1.2
Import upstream version 1.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/contrib/admindocs/utils.py
5
5
from email.Errors import HeaderParseError
6
6
from django.utils.safestring import mark_safe
7
7
from django.core.urlresolvers import reverse
 
8
from django.utils.encoding import smart_str
8
9
try:
9
10
    import docutils.core
10
11
    import docutils.nodes
64
65
        "link_base" : reverse('django-admindocs-docroot').rstrip('/')
65
66
    }
66
67
    if thing_being_parsed:
67
 
        thing_being_parsed = "<%s>" % thing_being_parsed
 
68
        thing_being_parsed = smart_str("<%s>" % thing_being_parsed)
68
69
    parts = docutils.core.publish_parts(text, source_path=thing_being_parsed,
69
70
                destination_path=None, writer_name='html',
70
71
                settings_overrides=overrides)