mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-02 04:48:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed #13573 -- Corrected problem with template caching when template directories are provided. Thanks to lamby for the report.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-05-21 08:54:15 +00:00
parent 6b2fd346ad
commit 8a6cb3d969
4 changed files with 35 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tests/regressiontests/templates/loaders.py
View file

@ -16,8 +16,9 @@ import imp
import StringIO
import os.path
from django.template import TemplateDoesNotExist
from django.template import TemplateDoesNotExist, Context
from django.template.loaders.eggs import load_template_source as lts_egg
from django.template import loader
# Mock classes and objects for pkg_resources functions.
class MockProvider(pkg_resources.NullProvider):
@ -89,5 +90,27 @@ class EggLoader(unittest.TestCase):
settings.INSTALLED_APPS = []
self.assertRaises(TemplateDoesNotExist, lts_egg, "y.html")
class CachedLoader(unittest.TestCase):
def setUp(self):
self.old_TEMPLATE_LOADERS = settings.TEMPLATE_LOADERS
settings.TEMPLATE_LOADERS = (
('django.template.loaders.cached.Loader', (
'django.template.loaders.filesystem.Loader',
)
),
)
def tearDown(self):
settings.TEMPLATE_LOADERS = self.old_TEMPLATE_LOADERS
def test_templatedir_caching(self):
"Check that the template directories form part of the template cache key. Refs #13573"
# Retrive a template specifying a template directory to check
t1, name = loader.find_template('test.html', (os.path.join(os.path.dirname(__file__), 'templates', 'first'),))
# Now retrieve the same template name, but from a different directory
t2, name = loader.find_template('test.html', (os.path.join(os.path.dirname(__file__), 'templates', 'second'),))
# The two templates should not have the same content
self.assertNotEqual(t1.render(Context({})), t2.render(Context({})))
if __name__ == "__main__":
unittest.main()