Ticket #7100: defaultfilters.diff

django/template/defaultfilters.py

@@ -10 +10 @@
 from django.template import Variable, Library
 from django.conf import settings
 from django.utils.translation import ugettext, ungettext
-from django.utils.encoding import force_unicode, iri_to_uri
+from django.utils.encoding import force_unicode, iri_to_uri,smart_str
 from django.utils.safestring import mark_safe, SafeData
 
 register = Library()
@@ -28 +28 @@
     def _dec(*args, **kwargs):
         if args:
             args = list(args)
+            if getattr(func, 'to_str', False):
+                args[0] = smart_str(args[0])
             args[0] = force_unicode(args[0])
             if isinstance(args[0], SafeData) and getattr(func, 'is_safe', False):
                 return mark_safe(func(*args, **kwargs))
@@ -223 +225 @@
         return value # Fail silently.
     return truncate_words(value, length)
 truncatewords.is_safe = True
+truncatewords.to_str = True
 truncatewords = stringfilter(truncatewords)
 
 def truncatewords_html(value, arg):