diff options
| author | Tim Graham <timograham@gmail.com> | 2014-11-24 08:34:02 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-01-17 09:00:17 -0500 |
| commit | fed25f1105ff0d5fe46cd217b29371ee7f1907f2 (patch) | |
| tree | 7b5320882f1034a65047948c30d56f38b28a5ba3 /tests | |
| parent | 4e65f195e1b10d83bb7edc38c908747c4fd537b8 (diff) | |
Removed compatibility with Python 3.2.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/requirements/base.txt | 2 | ||||
| -rw-r--r-- | tests/requirements/py2.txt | 1 | ||||
| -rw-r--r-- | tests/template_backends/test_jinja2.py | 17 |
3 files changed, 6 insertions, 14 deletions
diff --git a/tests/requirements/base.txt b/tests/requirements/base.txt index 3ffb042ae9..f74ffe1274 100644 --- a/tests/requirements/base.txt +++ b/tests/requirements/base.txt @@ -1,8 +1,6 @@ bcrypt docutils jinja2 -# move to py2.txt when dropping Python 3.2 -mock numpy Pillow PyYAML diff --git a/tests/requirements/py2.txt b/tests/requirements/py2.txt index a9f6804039..abce38c39c 100644 --- a/tests/requirements/py2.txt +++ b/tests/requirements/py2.txt @@ -1,2 +1,3 @@ -r base.txt python-memcached +mock diff --git a/tests/template_backends/test_jinja2.py b/tests/template_backends/test_jinja2.py index f8cbc047c1..1442f25e02 100644 --- a/tests/template_backends/test_jinja2.py +++ b/tests/template_backends/test_jinja2.py @@ -2,22 +2,15 @@ # silence an ImportWarning warning on Python 2. from __future__ import absolute_import -import sys - from unittest import skipIf -# Jinja2 doesn't run on Python 3.2 because it uses u-prefixed unicode strings. -if sys.version_info[:2] == (2, 7) or sys.version_info[:2] >= (3, 3): - try: - import jinja2 - except ImportError: - jinja2 = None - Jinja2 = None - else: - from django.template.backends.jinja2 import Jinja2 -else: +try: + import jinja2 +except ImportError: jinja2 = None Jinja2 = None +else: + from django.template.backends.jinja2 import Jinja2 from .test_dummy import TemplateStringsTests |