commit e0003555f8df3e1cc6721ca759f277b6fe21f3d4
author Thomas Waldmann <tw@waldmann-edv.de> Fri May 17 23:52:14 2013 +0200
committer Thomas Waldmann <tw@waldmann-edv.de> Fri May 17 23:52:14 2013 +0200
tree 29bb5baf4cceb6bba155f5f5c3da8760a432556a
parent 846bdc125c8463a6f9977aed4a977cbaaa3bc8d4

python 3 port: automated changes by a slightly modified python-modernize

(replacing unicode with six.text_type, but not replacing u"" by six.u(""))

jinja2/testsuite/security.py

diff --git a/jinja2/testsuite/security.py b/jinja2/testsuite/security.py
index 4518eac..c892fed 100644
--- a/jinja2/testsuite/security.py
+++ b/jinja2/testsuite/security.py
@@ -18,6 +18,7 @@
 from jinja2 import Markup, escape
 from jinja2.exceptions import SecurityError, TemplateSyntaxError, \
      TemplateRuntimeError
+import six
 
 
 class PrivateStuff(object):
@@ -76,7 +77,7 @@
         # adding two strings should escape the unsafe one
         unsafe = '<script type="application/x-some-script">alert("foo");</script>'
         safe = Markup('<em>username</em>')
-        assert unsafe + safe == unicode(escape(unsafe)) + unicode(safe)
+        assert unsafe + safe == six.text_type(escape(unsafe)) + six.text_type(safe)
 
         # string interpolations are safe to use too
         assert Markup('<em>%s</em>') % '<bad user>' == \
@@ -114,7 +115,7 @@
                             '{{ say_hello("<blink>foo</blink>") }}')
         escaped_out = '<p>Hello &lt;blink&gt;foo&lt;/blink&gt;!</p>'
         assert t.render() == escaped_out
-        assert unicode(t.module) == escaped_out
+        assert six.text_type(t.module) == escaped_out
         assert escape(t.module) == escaped_out
         assert t.module.say_hello('<blink>foo</blink>') == escaped_out
         assert escape(t.module.say_hello('<blink>foo</blink>')) == escaped_out
@@ -136,7 +137,7 @@
             t = env.from_string('{{ %s }}' % expr)
             try:
                 t.render(ctx)
-            except TemplateRuntimeError, e:
+            except TemplateRuntimeError as e:
                 pass
             else:
                 self.fail('expected runtime error')
@@ -153,7 +154,7 @@
             t = env.from_string('{{ %s }}' % expr)
             try:
                 t.render(ctx)
-            except TemplateRuntimeError, e:
+            except TemplateRuntimeError as e:
                 pass
             else:
                 self.fail('expected runtime error')