Merge branch 'master' of https://github.com/ryanbagwell/django-cas-provider into...

[django-cas-provider.git] / cas_provider_examples / simple / settings.py

diff --git a/cas_provider_examples/simple/settings.py b/cas_provider_examples/simple/settings.py
index 2d4eda3..6a520b4 100644 (file)
--- a/cas_provider_examples/simple/settings.py
+++ b/cas_provider_examples/simple/settings.py
@@ -5,7 +5,6 @@ from django import VERSION
 # Django settings for xxx project.
 
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     # ('Your Name', 'your_email@example.com'),
@@ -18,7 +17,7 @@ import os
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(os.path.realpath(__file__), 'db'),
+        'NAME': os.path.join(os.path.dirname(os.path.realpath(__file__)), 'db'),
     }
 }
 
@@ -54,6 +53,11 @@ MEDIA_ROOT = ''
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
 MEDIA_URL = ''
 
+# Allow SHA1, because it's used in the fixture.
+PASSWORD_HASHERS = [
+    'django.contrib.auth.hashers.SHA1PasswordHasher',
+]
+
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
@@ -87,14 +91,7 @@ STATICFILES_FINDERS = (
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'kv*6pmkq47crqskw%wkst!h7xnisy78zzli@rtklgm#y6o=of!'
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -102,14 +99,32 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
+# For Django < 1.10
+MIDDLEWARE_CLASSES = MIDDLEWARE
+
+
 ROOT_URLCONF = 'simple.urls'
 
 import os
 PROJECT_PATH = os.path.abspath(os.path.dirname(__file__))
 
-TEMPLATE_DIRS = (
-     os.path.join(PROJECT_PATH, 'templates'),
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+        'DIRS': [
+            os.path.join(PROJECT_PATH, 'templates'),
+        ],
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    }
+]
 
 INSTALLED_APPS = (
     'django.contrib.admin',
@@ -123,9 +138,6 @@ INSTALLED_APPS = (
     'simple',
 )
 
-if VERSION < (1, 7):
-    INSTALLED_APPS += ('south',)
-
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error.