openstack/deb-python-django-compressor
Code Issues Proposed changes

fixed support for python 2.6

Browse Source
This commit is contained in:
Lucas Tan
2014-04-05 18:50:40 +08:00
parent a19acb0be5
commit 3f1f64c84e
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compressor/offline/django.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import from __future__ import absolute_import # noqa
import io import io
from types import MethodType from types import MethodType

2
compressor/offline/jinja2.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import from __future__ import absolute_import # noqa
import io import io
import jinja2 import jinja2

13
compressor/tests/test_offline.py
View File

@@ -33,7 +33,10 @@ class OfflineTestCaseMixin(object):
templates_dir = "" templates_dir = ""
expected_hash = "" expected_hash = ""
# Engines to test # Engines to test
engines = ("django", "jinja2") if sys.version_info.major == 3 and sys.version_info.minor == 2:
engines = ("django",)
else:
engines = ("django", "jinja2")
def setUp(self): def setUp(self):
self._old_compress = settings.COMPRESS_ENABLED self._old_compress = settings.COMPRESS_ENABLED
@@ -382,8 +385,8 @@ class OfflineGenerationComplexTestCase(OfflineTestCaseMixin, TestCase):
self.assertEqual(rendered_template, "".join(result) + "\n") self.assertEqual(rendered_template, "".join(result) + "\n")
@unittest.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 2, @unittest.skipIf(sys.version_info >= (3, 2),
"Coffin does not support 3.2") "Coffin does not support 3.2+")
class OfflineGenerationCoffinTestCase(OfflineTestCaseMixin, TestCase): class OfflineGenerationCoffinTestCase(OfflineTestCaseMixin, TestCase):
templates_dir = "test_coffin" templates_dir = "test_coffin"
expected_hash = "32c8281e3346" expected_hash = "32c8281e3346"
@@ -402,8 +405,8 @@ class OfflineGenerationCoffinTestCase(OfflineTestCaseMixin, TestCase):
return env return env
@unittest.skipIf(sys.version_info.major == 3 and sys.version_info.minor == 2, @unittest.skipIf(sys.version_info >= (3, 2),
"Jingo does not support 3.2") "Jingo does not support 3.2+")
class OfflineGenerationJingoTestCase(OfflineTestCaseMixin, TestCase): class OfflineGenerationJingoTestCase(OfflineTestCaseMixin, TestCase):
templates_dir = "test_jingo" templates_dir = "test_jingo"
expected_hash = "61ec584468eb" expected_hash = "61ec584468eb"