summaryrefslogtreecommitdiff
path: root/django/template
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2015-02-05 11:53:04 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2015-02-05 20:09:22 +0100
commitaed1b1f6e5133f91c063f6f8b75729c4a18f99c7 (patch)
treeb741938589c82cc616d09673456b317beafdd606 /django/template
parent67787db22a3d684ce2800c80fca477af1684deab (diff)
[1.8.x] Fixed #24265 -- Preserved template backend loading exceptions.
If importing or initializing a template backend fails, attempting to access this template backend again must raise the same exception. Backport of 44ad6915 from master
Diffstat (limited to 'django/template')
-rw-r--r--django/template/utils.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/template/utils.py b/django/template/utils.py
index 3303c1ccb7..be2166810c 100644
--- a/django/template/utils.py
+++ b/django/template/utils.py
@@ -90,6 +90,10 @@ class EngineHandler(object):
"Could not find config for '{}' "
"in settings.TEMPLATES".format(alias))
+ # If importing or initializing the backend raises an exception,
+ # self._engines[alias] isn't set and this code may get executed
+ # again, so we must preserve the original params. See #24265.
+ params = params.copy()
backend = params.pop('BACKEND')
engine_cls = import_string(backend)
engine = engine_cls(params)