Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve template settings of #226 to avoid warnings 

This makes sure no TEMPLATE_.. settings are fed into Django 1.8+
fix_request_path_info
Diederik van der Boor 2016-07-08 12:14:09 +02:00
parent 426107dde4
commit 8649bbea67
1 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
runtests.py
View File

@ -1,36 +1,61 @@
#!/usr/bin/env python #!/usr/bin/env python
import django
import os import os
import sys import sys
import django
from django.conf import settings from django.conf import settings
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line
from django.conf import settings, global_settings as default_settings from django.conf import settings, global_settings as default_settings
from django.core.management import call_command from django.core.management import call_command
from os.path import dirname, realpath from os.path import dirname, realpath, abspath
# Give feedback on used versions # Give feedback on used versions
sys.stderr.write('Using Python version {0} from {1}\n'.format(sys.version[:5], sys.executable)) sys.stderr.write('Using Python version {0} from {1}\n'.format(sys.version[:5], sys.executable))
sys.stderr.write('Using Django version {0} from {1}\n'.format( sys.stderr.write('Using Django version {0} from {1}\n'.format(
django.get_version(), django.get_version(),
os.path.dirname(os.path.abspath(django.__file__))) dirname(abspath(django.__file__)))
) )
if not settings.configured: if not settings.configured:
context_processors = [ if django.VERSION >= (1, 8):
'django.contrib.auth.context_processors.auth', template_settings = dict(
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': (),
'OPTIONS': {
'loaders': (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
),
'context_processors': (
'django.template.context_processors.debug', 'django.template.context_processors.debug',
'django.template.context_processors.i18n', 'django.template.context_processors.i18n',
'django.template.context_processors.media', 'django.template.context_processors.media',
'django.template.context_processors.request',
'django.template.context_processors.static', 'django.template.context_processors.static',
'django.template.context_processors.tz', 'django.contrib.messages.context_processors.messages',
'django.contrib.auth.context_processors.auth',
),
},
},
]
)
else:
template_settings = dict(
TEMPLATE_LOADERS = (
'django.template.loaders.app_directories.Loader',
'django.template.loaders.filesystem.Loader',
),
TEMPLATE_CONTEXT_PROCESSORS = list(default_settings.TEMPLATE_CONTEXT_PROCESSORS) + [
'django.contrib.messages.context_processors.messages', 'django.contrib.messages.context_processors.messages',
'django.core.context_processors.request', 'django.core.context_processors.request',
] ],
)
settings.configure( settings.configure(
DEBUG=True, DEBUG=False,
TEMPLATE_DEBUG=True,
DATABASES={ DATABASES={
'default': { 'default': {
'ENGINE': 'django.db.backends.sqlite3', 'ENGINE': 'django.db.backends.sqlite3',
@ -41,20 +66,6 @@ if not settings.configured:
'NAME': ':memory:' 'NAME': ':memory:'
} }
}, },
TEMPLATE_LOADERS=(
'django.template.loaders.app_directories.Loader',
),
TEMPLATE_CONTEXT_PROCESSORS=context_processors,
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': context_processors,
},
},
],
TEST_RUNNER = 'django.test.runner.DiscoverRunner' if django.VERSION >= (1, 7) else 'django.test.simple.DjangoTestSuiteRunner', TEST_RUNNER = 'django.test.runner.DiscoverRunner' if django.VERSION >= (1, 7) else 'django.test.simple.DjangoTestSuiteRunner',
INSTALLED_APPS = ( INSTALLED_APPS = (
'django.contrib.auth', 'django.contrib.auth',
@ -66,6 +77,7 @@ if not settings.configured:
), ),
MIDDLEWARE_CLASSES = (), MIDDLEWARE_CLASSES = (),
SITE_ID = 3, SITE_ID = 3,
**template_settings
) )
DEFAULT_TEST_APPS = [ DEFAULT_TEST_APPS = [