1
0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00

Fixed handling of template loader tests.

Previously, the CachedLoaderTests were never run at all.
This commit is contained in:
Carl Meyer
2013-07-25 17:17:40 -05:00
parent 5ed7ec99b6
commit 8f3aefdec3
2 changed files with 27 additions and 30 deletions

View File

@@ -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