diff options
| -rw-r--r-- | django/template/engine.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/django/template/engine.py b/django/template/engine.py index a76d52c565..9fecabb259 100644 --- a/django/template/engine.py +++ b/django/template/engine.py @@ -36,7 +36,11 @@ class Engine(object): else: if app_dirs: raise ImproperlyConfigured( - "APP_DIRS must not be set when LOADERS is defined.") + "app_dirs must not be set when loaders is defined.") + + if isinstance(allowed_include_roots, six.string_types): + raise ImproperlyConfigured( + "allowed_include_roots must be a tuple, not a string.") self.dirs = dirs self.app_dirs = app_dirs |