From 7984b58e78f96541e48e7772be62afe2847aca24 Mon Sep 17 00:00:00 2001 From: Loic Bistuer Date: Fri, 1 Nov 2013 03:35:29 +0700 Subject: [PATCH] Fixed SyntaxError on Python 2.5 caused by a @unittest.skipIf class decoration. --- tests/regressiontests/templates/tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py index d3defb8183..8565d19289 100644 --- a/tests/regressiontests/templates/tests.py +++ b/tests/regressiontests/templates/tests.py @@ -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