From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 7 Aug 2013 13:28:50 +0000 (+0100)
Subject: Merge branch '2.7-maintenance'
X-Git-Tag: 2.8~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8db47916de0e888dd8664b2511e220ab5ecf5c15;p=thirdparty%2Fjinja.git

Merge branch '2.7-maintenance'
---

8db47916de0e888dd8664b2511e220ab5ecf5c15
diff --cc jinja2/filters.py
index 4ee4e040,fd0db04a..70bb9482
--- a/jinja2/filters.py
+++ b/jinja2/filters.py
@@@ -183,10 -183,10 +183,10 @@@ def do_title(s)
      uppercase letters, all remaining characters are lowercase.
      """
      rv = []
 -    for item in re.compile(r'([-\s]+)(?u)').split(s):
 +    for item in re.compile(r'([-\s]+)(?u)').split(soft_unicode(s)):
          if not item:
              continue
-         rv.append(item[0].upper() + item[1:])
+         rv.append(item[0].upper() + item[1:].lower())
      return ''.join(rv)
  
  
diff --cc jinja2/testsuite/filters.py
index fcf47a3b,282dd2d8..9d5c9522
--- a/jinja2/testsuite/filters.py
+++ b/jinja2/testsuite/filters.py
@@@ -208,15 -208,9 +208,17 @@@ class FilterTestCase(JinjaTestCase)
          assert tmpl.render() == "Foo-Bar"
          tmpl = env.from_string('''{{ "foo\tbar"|title }}''')
          assert tmpl.render() == "Foo\tBar"
+         tmpl = env.from_string('''{{ "FOO\tBAR"|title }}''')
+         assert tmpl.render() == "Foo\tBar"
  
 +        class Foo:
 +            def __str__(self):
 +                return 'foo-bar'
 +
 +        tmpl = env.from_string('''{{ data|title }}''')
 +        out = tmpl.render(data=Foo())
 +        assert out == 'Foo-Bar'
 +
      def test_truncate(self):
          tmpl = env.from_string(
              '{{ data|truncate(15, true, ">>>") }}|'