openstack/deb-python-django-overextends
Code Issues Proposed changes

Only add builtins template option on Django >= 1.9

Browse Source
This commit is contained in:
Stefan Wehrmeyer
2015-12-20 15:20:50 +01:00
parent f1b33a4b9d
commit 3ea8a8b991
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test_project/settings.py
View File

@@ -2,10 +2,11 @@
import os import os
import django
PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__)) PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
PROJECT_DIRNAME = PROJECT_ROOT.split(os.sep)[-1] PROJECT_DIRNAME = PROJECT_ROOT.split(os.sep)[-1]
ROOT_URLCONF = "%s.urls" % PROJECT_DIRNAME ROOT_URLCONF = "%s.urls" % PROJECT_DIRNAME
TEMPLATE_DIRS = (os.path.join(PROJECT_ROOT, "templates"),)
try: try:
import django.test.runner import django.test.runner
@@ -26,15 +27,21 @@ TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader', 'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader', 'django.template.loaders.app_directories.Loader',
) )
TEMPLATE_DIRS = (os.path.join(PROJECT_ROOT, "templates"),)
TEMPLATE_OPTIONS = {}
if django.VERSION >= (1, 9):
# only set builtins option on Django >= 1.9
TEMPLATE_OPTIONS = {
'builtins': ['overextends.templatetags.overextends_tags'],
}
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True, 'APP_DIRS': True,
'DIRS': TEMPLATE_DIRS, 'DIRS': TEMPLATE_DIRS,
'OPTIONS': { 'OPTIONS': TEMPLATE_OPTIONS
'builtins': ['overextends.templatetags.overextends_tags'],
}
}, },
] ]