Author: carljm
Date: 2012-03-01 11:49:19 -0800 (Thu, 01 Mar 2012)
New Revision: 17610
Modified:
django/trunk/django/contrib/markup/templatetags/markup.py
Log:
Corrected contrib.markup filter errors to not use misleading template syntax.
Modified: django/trunk/django/contrib/markup/templatetags/markup.py
===================================================================
--- django/trunk/django/contrib/markup/templatetags/markup.py 2012-03-01
19:34:23 UTC (rev 17609)
+++ django/trunk/django/contrib/markup/templatetags/markup.py 2012-03-01
19:49:19 UTC (rev 17610)
@@ -24,7 +24,7 @@
import textile
except ImportError:
if settings.DEBUG:
- raise template.TemplateSyntaxError("Error in {% textile %} filter:
The Python textile library isn't installed.")
+ raise template.TemplateSyntaxError("Error in 'textile' filter: The
Python textile library isn't installed.")
return force_unicode(value)
else:
return mark_safe(force_unicode(textile.textile(smart_str(value),
encoding='utf-8', output='utf-8')))
@@ -51,7 +51,7 @@
import markdown
except ImportError:
if settings.DEBUG:
- raise template.TemplateSyntaxError("Error in {% markdown %}
filter: The Python markdown library isn't installed.")
+ raise template.TemplateSyntaxError("Error in 'markdown' filter:
The Python markdown library isn't installed.")
return force_unicode(value)
else:
# markdown.version was first added in 1.6b. The only version of
markdown
@@ -79,7 +79,7 @@
from docutils.core import publish_parts
except ImportError:
if settings.DEBUG:
- raise template.TemplateSyntaxError("Error in {% restructuredtext
%} filter: The Python docutils library isn't installed.")
+ raise template.TemplateSyntaxError("Error in 'restructuredtext'
filter: The Python docutils library isn't installed.")
return force_unicode(value)
else:
docutils_settings = getattr(settings,
"RESTRUCTUREDTEXT_FILTER_SETTINGS", {})
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@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.
