diff options
| -rw-r--r-- | django/template/loader.py | 4 | ||||
| -rw-r--r-- | docs/releases/1.8.txt | 3 | ||||
| -rw-r--r-- | tests/template_tests/test_loaders.py | 10 |
3 files changed, 8 insertions, 9 deletions
diff --git a/django/template/loader.py b/django/template/loader.py index b76fbdcfb9..f27494dfb1 100644 --- a/django/template/loader.py +++ b/django/template/loader.py @@ -17,10 +17,6 @@ class LoaderOrigin(Origin): return self.loader(self.loadname, self.dirs)[0] -def find_template(*args, **kwargs): - return Engine.get_default().find_template(*args, **kwargs) - - def get_template(template_name, dirs=_dirs_undefined, using=None): """ Loads and returns a template for the given name. diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt index a4bc14332c..3ebdebbea0 100644 --- a/docs/releases/1.8.txt +++ b/docs/releases/1.8.txt @@ -838,7 +838,8 @@ Cleanup of the ``django.template`` namespace If you've been relying on private APIs exposed in the ``django.template`` module, you may have to import them from ``django.template.base`` instead. -Also ``django.template.base.compile_string()`` was removed. +Also private APIs ``django.template.base.compile_string()`` and +``django.template.loader.find_template()`` were removed. Miscellaneous ~~~~~~~~~~~~~ diff --git a/tests/template_tests/test_loaders.py b/tests/template_tests/test_loaders.py index 4a6635f08f..f068d8b71a 100644 --- a/tests/template_tests/test_loaders.py +++ b/tests/template_tests/test_loaders.py @@ -114,10 +114,12 @@ class EggLoaderTest(SimpleTestCase): class CachedLoader(SimpleTestCase): def test_templatedir_caching(self): "Check that the template directories form part of the template cache key. Refs #13573" + template_loader = Engine.get_default().template_loaders[0] + # Retrieve a template specifying a template directory to check - t1, name = loader.find_template('test.html', (os.path.join(os.path.dirname(upath(__file__)), 'templates', 'first'),)) + t1, name = template_loader.find_template('test.html', (os.path.join(os.path.dirname(upath(__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(upath(__file__)), 'templates', 'second'),)) + t2, name = template_loader.find_template('test.html', (os.path.join(os.path.dirname(upath(__file__)), 'templates', 'second'),)) # The two templates should not have the same content self.assertNotEqual(t1.render(Context({})), t2.render(Context({}))) @@ -215,7 +217,7 @@ class PriorityCacheLoader(SimpleTestCase): """ Check that the order of template loader works. Refs #21460. """ - t1, name = loader.find_template('priority/foo.html') + t1 = loader.get_template('priority/foo.html') self.assertEqual(t1.render(Context({})), 'priority\n') @@ -228,5 +230,5 @@ class PriorityLoader(SimpleTestCase): """ Check that the order of template loader works. Refs #21460. """ - t1, name = loader.find_template('priority/foo.html') + t1 = loader.get_template('priority/foo.html') self.assertEqual(t1.render(Context({})), 'priority\n') |