Update Flask

libs/jinja2/testsuite/filters.py

@@ -84,28 +84,10 @@ class FilterTestCase(JinjaTestCase):
             '{{ 1000000000000|filesizeformat(true) }}'
         )
         out = tmpl.render()
-        self.assert_equal(out, (
-            '100 Bytes|1.0 kB|1.0 MB|1.0 GB|1.0 TB|100 Bytes|'
-            '1000 Bytes|976.6 KiB|953.7 MiB|931.3 GiB'
-        ))
-
-    def test_filesizeformat_issue59(self):
-        tmpl = env.from_string(
-            '{{ 300|filesizeformat }}|'
-            '{{ 3000|filesizeformat }}|'
-            '{{ 3000000|filesizeformat }}|'
-            '{{ 3000000000|filesizeformat }}|'
-            '{{ 3000000000000|filesizeformat }}|'
-            '{{ 300|filesizeformat(true) }}|'
-            '{{ 3000|filesizeformat(true) }}|'
-            '{{ 3000000|filesizeformat(true) }}'
+        assert out == (
+            '100 Bytes|0.0 kB|0.0 MB|0.0 GB|0.0 TB|100 Bytes|'
+            '1000 Bytes|1.0 KiB|0.9 MiB|0.9 GiB'
         )
-        out = tmpl.render()
-        self.assert_equal(out, (
-            '300 Bytes|3.0 kB|3.0 MB|3.0 GB|3.0 TB|300 Bytes|'
-            '2.9 KiB|2.9 MiB'
-        ))
-
 
     def test_first(self):
         tmpl = env.from_string('{{ foo|first }}')
@@ -193,16 +175,6 @@ class FilterTestCase(JinjaTestCase):
     def test_title(self):
         tmpl = env.from_string('''{{ "foo bar"|title }}''')
         assert tmpl.render() == "Foo Bar"
-        tmpl = env.from_string('''{{ "foo's bar"|title }}''')
-        assert tmpl.render() == "Foo's Bar"
-        tmpl = env.from_string('''{{ "foo   bar"|title }}''')
-        assert tmpl.render() == "Foo   Bar"
-        tmpl = env.from_string('''{{ "f bar f"|title }}''')
-        assert tmpl.render() == "F Bar F"
-        tmpl = env.from_string('''{{ "foo-bar"|title }}''')
-        assert tmpl.render() == "Foo-Bar"
-        tmpl = env.from_string('''{{ "foo\tbar"|title }}''')
-        assert tmpl.render() == "Foo\tBar"
 
     def test_truncate(self):
         tmpl = env.from_string(
@@ -377,18 +349,6 @@ class FilterTestCase(JinjaTestCase):
         tmpl = env.from_string('{{ "<div>foo</div>" }}')
         assert tmpl.render() == '&lt;div&gt;foo&lt;/div&gt;'
 
-    def test_urlencode(self):
-        env = Environment(autoescape=True)
-        tmpl = env.from_string('{{ "Hello, world!"|urlencode }}')
-        assert tmpl.render() == 'Hello%2C%20world%21'
-        tmpl = env.from_string('{{ o|urlencode }}')
-        assert tmpl.render(o=u"Hello, world\u203d") == "Hello%2C%20world%E2%80%BD"
-        assert tmpl.render(o=(("f", 1),)) == "f=1"
-        assert tmpl.render(o=(('f', 1), ("z", 2))) == "f=1&amp;z=2"
-        assert tmpl.render(o=((u"\u203d", 1),)) == "%E2%80%BD=1"
-        assert tmpl.render(o={u"\u203d": 1}) == "%E2%80%BD=1"
-        assert tmpl.render(o={0: 1}) == "0=1"
-
 
 def suite():
     suite = unittest.TestSuite()

libs/jinja2/testsuite/lexnparse.py

@@ -169,7 +169,7 @@ and bar comment #}
             except TemplateSyntaxError, e:
                 assert str(e) == expected, 'unexpected error message'
             else:
-                assert False, 'that was supposed to be an error'
+                assert False, 'that was suposed to be an error'
 
         assert_error('{% for item in seq %}...{% endif %}',
                      "Encountered unknown tag 'endif'. Jinja was looking "
@@ -189,7 +189,7 @@ and bar comment #}
                      "that needs to be closed is 'for'.")
         assert_error('{% block foo-bar-baz %}',
                      "Block names in Jinja have to be valid Python identifiers "
-                     "and may not contain hyphens, use an underscore instead.")
+                     "and may not contain hypens, use an underscore instead.")
         assert_error('{% unknown_tag %}',
                      "Encountered unknown tag 'unknown_tag'.")
 
@@ -317,7 +317,7 @@ class SyntaxTestCase(JinjaTestCase):
         self.assert_raises(TemplateSyntaxError, env.from_string,
                            '{% block x %}{% endblock y %}')
 
-    def test_constant_casing(self):
+    def test_contant_casing(self):
         for const in True, False, None:
             tmpl = env.from_string('{{ %s }}|{{ %s }}|{{ %s }}' % (
                 str(const), str(const).lower(), str(const).upper()
@@ -327,7 +327,7 @@ class SyntaxTestCase(JinjaTestCase):
     def test_test_chaining(self):
         self.assert_raises(TemplateSyntaxError, env.from_string,
                            '{{ foo is string is sequence }}')
-        assert env.from_string('{{ 42 is string or 42 is number }}'
+        env.from_string('{{ 42 is string or 42 is number }}'
             ).render() == 'True'
 
     def test_string_concatenation(self):

libs/jinja2/testsuite/loader.py

@@ -182,34 +182,6 @@ class ModuleLoaderTestCase(JinjaTestCase):
             tmpl_3c4ddf650c1a73df961a6d3d2ce2752f1b8fd490
         assert mod.__file__.endswith('.pyc')
 
-    def test_choice_loader(self):
-        log = self.compile_down(py_compile=True)
-        assert 'Byte-compiled "a/test.html"' in log
-
-        self.mod_env.loader = loaders.ChoiceLoader([
-            self.mod_env.loader,
-            loaders.DictLoader({'DICT_SOURCE': 'DICT_TEMPLATE'})
-        ])
-
-        tmpl1 = self.mod_env.get_template('a/test.html')
-        self.assert_equal(tmpl1.render(), 'BAR')
-        tmpl2 = self.mod_env.get_template('DICT_SOURCE')
-        self.assert_equal(tmpl2.render(), 'DICT_TEMPLATE')
-
-    def test_prefix_loader(self):
-        log = self.compile_down(py_compile=True)
-        assert 'Byte-compiled "a/test.html"' in log
-
-        self.mod_env.loader = loaders.PrefixLoader({
-            'MOD':      self.mod_env.loader,
-            'DICT':     loaders.DictLoader({'test.html': 'DICT_TEMPLATE'})
-        })
-
-        tmpl1 = self.mod_env.get_template('MOD/a/test.html')
-        self.assert_equal(tmpl1.render(), 'BAR')
-        tmpl2 = self.mod_env.get_template('DICT/test.html')
-        self.assert_equal(tmpl2.render(), 'DICT_TEMPLATE')
-
 
 def suite():
     suite = unittest.TestSuite()