From 8f3aefdec33f6cb4bdda142ff9f7fa423c0bebbd Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Thu, 25 Jul 2013 17:17:40 -0500 Subject: Fixed handling of template loader tests. Previously, the CachedLoaderTests were never run at all. --- tests/template_tests/tests.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'tests/template_tests/tests.py') diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py index 6b8a106623..81f4682f16 100644 --- a/tests/template_tests/tests.py +++ b/tests/template_tests/tests.py @@ -8,8 +8,7 @@ if __name__ == '__main__': # before importing 'template'. settings.configure() -from datetime import date, datetime, timedelta -import time +from datetime import date, datetime import os import sys import traceback @@ -31,21 +30,12 @@ from django.test.utils import (setup_test_template_loader, from django.utils.encoding import python_2_unicode_compatible from django.utils.formats import date_format from django.utils._os import upath -from django.utils.translation import activate, deactivate, ugettext as _ +from django.utils.translation import activate, deactivate from django.utils.safestring import mark_safe from django.utils import six -from django.utils.tzinfo import LocalTimezone from i18n import TransRealMixin -try: - from .loaders import RenderToStringTest, EggLoaderTest -except ImportError as e: - if "pkg_resources" in e.args[0]: - pass # If setuptools isn't installed, that's fine. Just move on. - else: - raise - # NumPy installed? try: import numpy -- cgit v1.3