Commit d3205e3e authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Deprecated TEMPLATE_DIRS.

parent cf0fd65e

django/contrib/flatpages/tests/settings.py

0 → 100644
+12 −0
Original line number Diff line number Diff line 
import os





FLATPAGES_TEMPLATES = [{

    'BACKEND': 'django.template.backends.django.DjangoTemplates',

    'DIRS': [os.path.join(os.path.dirname(__file__), 'templates')],

    'OPTIONS': {

        'context_processors': (

            'django.contrib.auth.context_processors.auth',

        ),

    },

}]

django/contrib/flatpages/tests/test_csrf.py

+3 −4
Original line number Diff line number Diff line 
import os

from django.contrib.auth.models import User

from django.contrib.auth.tests.utils import skipIfCustomUser

from django.test import TestCase, Client

from django.test import override_settings



from .settings import FLATPAGES_TEMPLATES





@override_settings(

    LOGIN_URL='/accounts/login/',
@@ -17,9 +18,7 @@ from django.test import override_settings 
    ),

    ROOT_URLCONF='django.contrib.flatpages.tests.urls',

    CSRF_FAILURE_VIEW='django.views.csrf.csrf_failure',

    TEMPLATE_DIRS=(

        os.path.join(os.path.dirname(__file__), 'templates'),

    ),

    TEMPLATES=FLATPAGES_TEMPLATES,

    SITE_ID=1,

)

class FlatpageCSRFTests(TestCase):

django/contrib/flatpages/tests/test_middleware.py

+4 −7
Original line number Diff line number Diff line 
import os

from django.conf import settings

from django.contrib.auth.models import User

from django.contrib.auth.tests.utils import skipIfCustomUser

from django.contrib.flatpages.models import FlatPage

from django.test import TestCase, override_settings



from .settings import FLATPAGES_TEMPLATES





@override_settings(

    LOGIN_URL='/accounts/login/',
@@ -17,9 +18,7 @@ from django.test import TestCase, override_settings 
        'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',

    ),

    ROOT_URLCONF='django.contrib.flatpages.tests.urls',

    TEMPLATE_DIRS=(

        os.path.join(os.path.dirname(__file__), 'templates'),

    ),

    TEMPLATES=FLATPAGES_TEMPLATES,

    SITE_ID=1,

)

class FlatpageMiddlewareTests(TestCase):
@@ -97,9 +96,7 @@ class FlatpageMiddlewareTests(TestCase): 
        'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',

    ),

    ROOT_URLCONF='django.contrib.flatpages.tests.urls',

    TEMPLATE_DIRS=(

        os.path.join(os.path.dirname(__file__), 'templates'),

    ),

    TEMPLATES=FLATPAGES_TEMPLATES,

    SITE_ID=1,

)

class FlatpageMiddlewareAppendSlashTests(TestCase):

django/contrib/flatpages/tests/test_templatetags.py

+3 −4
Original line number Diff line number Diff line 
import os

from django.contrib.auth.models import AnonymousUser, User

from django.contrib.auth.tests.utils import skipIfCustomUser

from django.template import Template, Context, TemplateSyntaxError

from django.test import TestCase, override_settings



from .settings import FLATPAGES_TEMPLATES





@override_settings(

    MIDDLEWARE_CLASSES=(
@@ -15,9 +16,7 @@ from django.test import TestCase, override_settings 
        'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',

    ),

    ROOT_URLCONF='django.contrib.flatpages.tests.urls',

    TEMPLATE_DIRS=(

        os.path.join(os.path.dirname(__file__), 'templates'),

    ),

    TEMPLATES=FLATPAGES_TEMPLATES,

    SITE_ID=1,

)

class FlatpageTemplateTagTests(TestCase):

django/contrib/flatpages/tests/test_views.py

+4 −7
Original line number Diff line number Diff line 
import os

from django.conf import settings

from django.contrib.auth.models import User

from django.contrib.auth.tests.utils import skipIfCustomUser

from django.contrib.flatpages.models import FlatPage

from django.test import TestCase, override_settings



from .settings import FLATPAGES_TEMPLATES





@override_settings(

    LOGIN_URL='/accounts/login/',
@@ -17,9 +18,7 @@ from django.test import TestCase, override_settings 
        # no 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware'

    ),

    ROOT_URLCONF='django.contrib.flatpages.tests.urls',

    TEMPLATE_DIRS=(

        os.path.join(os.path.dirname(__file__), 'templates'),

    ),

    TEMPLATES=FLATPAGES_TEMPLATES,

    SITE_ID=1,

)

class FlatpageViewTests(TestCase):
@@ -85,9 +84,7 @@ class FlatpageViewTests(TestCase): 
        # no 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware'

    ),

    ROOT_URLCONF='django.contrib.flatpages.tests.urls',

    TEMPLATE_DIRS=(

        os.path.join(os.path.dirname(__file__), 'templates'),

    ),

    TEMPLATES=FLATPAGES_TEMPLATES,

    SITE_ID=1,

)

class FlatpageViewAppendSlashTests(TestCase):