test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1837 from loic/django14 

Fixed SyntaxError on Python 2.5 caused by a @unittest.skipIf class decoration.
This commit is contained in:
Aymeric Augustin 2013-11-01 01:21:34 -07:00
parent d491702ed7 7984b58e78
commit b149d1fcd6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/regressiontests/templates/tests.py
View File

@ -1765,9 +1765,7 @@ class RequestContextTests(BaseTemplateResponseTest):
'none'
)
@unittest.skipIf(' ' in __file__,
"The {%% ssi %%} tag in Django 1.4 doesn't support spaces in path.")
skip_reason = "The {%% ssi %%} tag in Django 1.4 doesn't support spaces in path."
class SSITests(unittest.TestCase):
def setUp(self):
self.this_dir = os.path.dirname(os.path.abspath(__file__))
@ -1778,11 +1776,13 @@ class SSITests(unittest.TestCase):
self.assertTrue(os.path.exists(path))
return template.Template('{%% ssi %s %%}' % path).render(Context())
@unittest.skipIf(' ' in __file__, skip_reason)
def test_allowed_paths(self):
acceptable_path = os.path.join(self.ssi_dir, "..", "first", "test.html")
with override_settings(ALLOWED_INCLUDE_ROOTS=(self.ssi_dir,)):
self.assertEqual(self.render_ssi(acceptable_path), 'First template\n')
@unittest.skipIf(' ' in __file__, skip_reason)
def test_relative_include_exploit(self):
"""
May not bypass ALLOWED_INCLUDE_ROOTS with relative paths