summaryrefslogtreecommitdiff
path: root/tests/regressiontests/templates/tests.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2011-10-13 21:34:56 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2011-10-13 21:34:56 +0000
commit8c0eefd066aa0e5bfe8c1006d055be8e2ad69a2b (patch)
treebded379649862a6b9c28553bc5130da524aac209 /tests/regressiontests/templates/tests.py
parentf830166167833cfb7c990764f72373a9f4494259 (diff)
Convert the remainder of the relative imports in the tests to be absolute imports.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/templates/tests.py')
-rw-r--r--tests/regressiontests/templates/tests.py26
1 files changed, 14 insertions, 12 deletions
diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py
index f85416563b..d0c2204f37 100644
--- a/tests/regressiontests/templates/tests.py
+++ b/tests/regressiontests/templates/tests.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import with_statement
+from __future__ import with_statement, absolute_import
from django.conf import settings
@@ -17,10 +17,11 @@ import warnings
from urlparse import urljoin
from django import template
-from django.template import base as template_base, RequestContext
+from django.template import base as template_base, RequestContext, Template, Context
from django.core import urlresolvers
from django.template import loader
from django.template.loaders import app_directories, filesystem, cached
+from django.test import RequestFactory
from django.test.utils import (get_warnings_state, restore_warnings_state,
setup_test_template_loader, restore_template_loaders, override_settings)
from django.utils import unittest
@@ -29,24 +30,25 @@ from django.utils.translation import activate, deactivate, ugettext as _
from django.utils.safestring import mark_safe
from django.utils.tzinfo import LocalTimezone
-from callables import *
-from context import ContextTests
-from custom import CustomTagTests, CustomFilterTests
-from parser import ParserTests
-from unicode import UnicodeTests
-from nodelist import NodelistTest, ErrorIndexTest
-from smartif import *
-from response import *
+from .callables import CallableVariablesTests
+from .context import ContextTests
+from .custom import CustomTagTests, CustomFilterTests
+from .parser import ParserTests
+from .unicode import UnicodeTests
+from .nodelist import NodelistTest, ErrorIndexTest
+from .smartif import SmartIfTests
+from .response import (TemplateResponseTest, BaseTemplateResponseTest,
+ CacheMiddlewareTest, SimpleTemplateResponseTest, CustomURLConfTest)
try:
- from loaders import *
+ from .loaders import RenderToStringTest, EggLoaderTest
except ImportError, e:
if "pkg_resources" in e.message:
pass # If setuptools isn't installed, that's fine. Just move on.
else:
raise
-import filters
+from . import filters
#################################
# Custom template tag for tests #