summaryrefslogtreecommitdiff
path: root/django/template/engine.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-08-17 09:34:50 -0400
committerTim Graham <timograham@gmail.com>2015-09-23 19:31:09 -0400
commit04ee4059d71dbc6aa029907e251360eaf00e11bb (patch)
treed675a92c2f0beec5e3904c7b02e415d91d8e5c10 /django/template/engine.py
parent3af9b70028487be81c4f6ca65ca0d1f2be337e4f (diff)
Refs #24022 -- Removed the ssi tag per deprecation timeline.
Diffstat (limited to 'django/template/engine.py')
-rw-r--r--django/template/engine.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/django/template/engine.py b/django/template/engine.py
index 2c9e2c2892..75d39c82a0 100644
--- a/django/template/engine.py
+++ b/django/template/engine.py
@@ -23,14 +23,11 @@ class Engine(object):
'django.template.loader_tags',
]
- def __init__(self, dirs=None, app_dirs=False,
- allowed_include_roots=None, context_processors=None,
+ def __init__(self, dirs=None, app_dirs=False, context_processors=None,
debug=False, loaders=None, string_if_invalid='',
file_charset='utf-8', libraries=None, builtins=None):
if dirs is None:
dirs = []
- if allowed_include_roots is None:
- allowed_include_roots = []
if context_processors is None:
context_processors = []
if loaders is None:
@@ -46,13 +43,8 @@ class Engine(object):
if builtins is None:
builtins = []
- 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
- self.allowed_include_roots = allowed_include_roots
self.context_processors = context_processors
self.debug = debug
self.loaders = loaders