Ticket #9483: patch_2_trunk.diff

django/template/defaultfilters.py

@@ -1 +1 @@
 """Default variable filters."""
 
 import re
+import string
 
 try:
     from decimal import Decimal, InvalidOperation, ROUND_HALF_UP
@@ -245 +246 @@
 
 def title(value):
     """Converts a string into titlecase."""
-    return re.sub("([a-z])'([A-Z])", lambda m: m.group(0).lower(), value.title())
+    return re.sub("([a-z])'([A-Z])", lambda m: m.group(0).lower(), string.capwords(value))
 title.is_safe = True
 title = stringfilter(title)
 

tests/regressiontests/defaultfilters/tests.py

@@ -113 +113 @@
 >>> title(u'discoth\xe8que')
 u'Discoth\xe8que'
 
+>>> title('fun&niest li"ne ever')
+u'Fun&niest Li"ne Ever'
+
 >>> truncatewords(u'A sentence with a few words in it', 1)
 u'A ...'
 

tests/regressiontests/templates/filters.py

@@ -113 +113 @@
         'filter-stringformat01': ('{% autoescape off %}.{{ a|stringformat:"5s" }}. .{{ b|stringformat:"5s" }}.{% endautoescape %}', {"a": "a<b", "b": mark_safe("a<b")}, u".  a<b. .  a<b."),
         'filter-stringformat02': ('.{{ a|stringformat:"5s" }}. .{{ b|stringformat:"5s" }}.', {"a": "a<b", "b": mark_safe("a<b")}, u".  a&lt;b. .  a<b."),
 
-        # XXX No test for "title" filter; needs an actual object.
+        # Check if "title" filter doesn't trip over quotes or ampersands
+        'filter-title01': ('{{ a|title }}', {"a": "fun&niest li\"ne ever"}, "Fun&amp;niest Li&quot;ne Ever"),
 
         'filter-truncatewords01': ('{% autoescape off %}{{ a|truncatewords:"2" }} {{ b|truncatewords:"2"}}{% endautoescape %}', {"a": "alpha & bravo", "b": mark_safe("alpha &amp; bravo")}, u"alpha & ... alpha &amp; ..."),
         'filter-truncatewords02': ('{{ a|truncatewords:"2" }} {{ b|truncatewords:"2"}}', {"a": "alpha & bravo", "b": mark_safe("alpha &amp; bravo")}, u"alpha &amp; ... alpha &amp; ..."),