updated filters: wordwraps uses the wordwrap module and urlize marks the result as HTML now if in autoescape mode

--HG--
branch : trunk
diff --git a/jinja2/parser.py b/jinja2/parser.py
index 4239e25..05d2e32 100644
--- a/jinja2/parser.py
+++ b/jinja2/parser.py
@@ -152,8 +152,7 @@
         return node
 
     def parse_import_context(self, node, default):
-        if (self.stream.current.test('name:with') or
-            self.stream.current.test('name:without')) and \
+        if self.stream.current.test_any('name:with', 'name:without') and \
            self.stream.look().test('name:context'):
             node.with_context = self.stream.next().value == 'with'
             self.stream.skip()
@@ -722,7 +721,7 @@
                 flush_data()
                 self.stream.next()
                 if end_tokens is not None and \
-                   self.stream.current.test_many(end_tokens):
+                   self.stream.current.test_any(*end_tokens):
                     return body
                 body.append(self.parse_statement())
                 self.stream.expect('block_end')