From 7ece6338313925d0ef673c09e408d7bc302b832c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 1 Jun 2016 13:57:27 +0100 Subject: [PATCH] Remove unused TEMPLATE_LOADERS setting, in favor of TEMPLATES. --- tests/conftest.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index f7b3d8386..d04ccbf3d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,18 +3,18 @@ def pytest_configure(): settings.configure( DEBUG_PROPAGATE_EXCEPTIONS=True, - DATABASES={'default': {'ENGINE': 'django.db.backends.sqlite3', - 'NAME': ':memory:'}}, + DATABASES={ + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': ':memory:' + } + }, SITE_ID=1, SECRET_KEY='not very secret in tests', USE_I18N=True, USE_L10N=True, STATIC_URL='/static/', ROOT_URLCONF='tests.urls', - TEMPLATE_LOADERS=( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', - ), TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', @@ -33,7 +33,6 @@ def pytest_configure(): 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.staticfiles', - 'rest_framework', 'rest_framework.authtoken', 'tests',