Ticket #2359: auto.patch

django/contrib/markup/templatetags/markup.py

@@ -26 +26 @@
     except ImportError:
         if settings.DEBUG:
             raise template.TemplateSyntaxError, "Error in {% textile %} filter: The Python textile library isn't installed."
-        return mark_safe(value)
+        return value
     else:
         return mark_safe(textile.textile(value, encoding=settings.DEFAULT_CHARSET, output=settings.DEFAULT_CHARSET))
 textile.is_safe = True
@@ -37 +37 @@
     except ImportError:
         if settings.DEBUG:
             raise template.TemplateSyntaxError, "Error in {% markdown %} filter: The Python markdown library isn't installed."
-        return mark_safe(value)
+        return value
     else:
         return mark_safe(markdown.markdown(value))
 markdown.is_safe = True
@@ -48 +48 @@
     except ImportError:
         if settings.DEBUG:
             raise template.TemplateSyntaxError, "Error in {% restructuredtext %} filter: The Python docutils library isn't installed."
-        return mark_safe(value)
+        return value
     else:
         docutils_settings = getattr(settings, "RESTRUCTUREDTEXT_FILTER_SETTINGS", {})
         parts = publish_parts(source=value, writer_name="html4css1", settings_overrides=docutils_settings)

django/utils/safestring.py

@@ -37 +37 @@
         if isinstance(rhs, SafeUnicode):
             return SafeUnicode(self + rhs)
         elif isinstance(rhs, SafeString):
-            return SafeString(self, rhs)
+            return SafeString(self + rhs)
         else:
             return super(SafeString, self).__add__(rhs)