Deprecated dirs argument to override TEMPLATE_DIRS.

Cancels 2f0566fa. Refs #4278.
This commit is contained in:
Aymeric Augustin 2014-11-13 20:25:08 +01:00
parent bcb693ebd4
commit 17012b6936
6 changed files with 68 additions and 36 deletions

View file

@ -25,6 +25,7 @@ from django.template.loaders.eggs import Loader as EggLoader
from django.template.loaders.utils import find_template_loader
from django.template import loader
from django.test import TestCase, override_settings
from django.test.utils import IgnorePendingDeprecationWarningsMixin
from django.utils import six
from django.utils._os import upath
from django.utils.six import StringIO
@ -185,7 +186,7 @@ class RenderToStringTest(TestCase):
loader.render_to_string('test_context_stack.html', context_instance=Context()).strip())
class TemplateDirsOverrideTest(unittest.TestCase):
class TemplateDirsOverrideTest(IgnorePendingDeprecationWarningsMixin, unittest.TestCase):
dirs_tuple = (os.path.join(os.path.dirname(upath(__file__)), 'other_templates'),)
dirs_list = list(dirs_tuple)