Got rid of py.testisms.
--HG--
branch : trunk
diff --git a/tests/test_security.py b/tests/test_security.py
index 6b8a5db..9d910b6 100644
--- a/tests/test_security.py
+++ b/tests/test_security.py
@@ -13,13 +13,7 @@
from jinja2.exceptions import SecurityError, TemplateSyntaxError
-import conftest
-if conftest.NOSE:
- from nose.tools import assert_raises as raises
- import sys
- MODULE = sys.modules[__name__]
-else:
- from py.test import raises
+from nose.tools import assert_raises
class PrivateStuff(object):
@@ -44,19 +38,19 @@
def test_unsafe():
'''
->>> env = MODULE.SandboxedEnvironment()
->>> env.from_string("{{ foo.foo() }}").render(foo=MODULE.PrivateStuff())
+>>> env = SandboxedEnvironment()
+>>> env.from_string("{{ foo.foo() }}").render(foo=PrivateStuff())
Traceback (most recent call last):
...
SecurityError: <bound method PrivateStuff.foo of PrivateStuff> is not safely callable
->>> env.from_string("{{ foo.bar() }}").render(foo=MODULE.PrivateStuff())
+>>> env.from_string("{{ foo.bar() }}").render(foo=PrivateStuff())
u'23'
->>> env.from_string("{{ foo._foo() }}").render(foo=MODULE.PublicStuff())
+>>> env.from_string("{{ foo._foo() }}").render(foo=PublicStuff())
Traceback (most recent call last):
...
SecurityError: access to attribute '_foo' of 'PublicStuff' object is unsafe.
->>> env.from_string("{{ foo.bar() }}").render(foo=MODULE.PublicStuff())
+>>> env.from_string("{{ foo.bar() }}").render(foo=PublicStuff())
u'23'
>>> env.from_string("{{ foo.__class__ }}").render(foo=42)
@@ -72,15 +66,15 @@
def test_restricted():
env = SandboxedEnvironment()
- raises(TemplateSyntaxError, env.from_string,
- "{% for item.attribute in seq %}...{% endfor %}")
- raises(TemplateSyntaxError, env.from_string,
- "{% for foo, bar.baz in seq %}...{% endfor %}")
+ assert_raises(TemplateSyntaxError, env.from_string,
+ "{% for item.attribute in seq %}...{% endfor %}")
+ assert_raises(TemplateSyntaxError, env.from_string,
+ "{% for foo, bar.baz in seq %}...{% endfor %}")
def test_immutable_environment():
'''
->>> env = MODULE.ImmutableSandboxedEnvironment()
+>>> env = ImmutableSandboxedEnvironment()
>>> env.from_string('{{ [].append(23) }}').render()
Traceback (most recent call last):
...
@@ -144,4 +138,4 @@
def test_attr_filter():
env = SandboxedEnvironment()
tmpl = env.from_string('{{ 42|attr("__class__")|attr("__subclasses__")() }}')
- raises(SecurityError, tmpl.render)
+ assert_raises(SecurityError, tmpl.render)