Commit 655a856d by Chris Johnston

Update to work with django 1.4

parent 5b516514
...@@ -38,12 +38,12 @@ ADMINS = ( ...@@ -38,12 +38,12 @@ ADMINS = (
MANAGERS = ADMINS MANAGERS = ADMINS
DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. DATABASES = {
DATABASE_NAME = 'sqlite.db' # Or path to database file if using sqlite3. 'default': {
DATABASE_USER = '' # Not used with sqlite3. 'ENGINE': 'django.db.backends.sqlite3',
DATABASE_PASSWORD = '' # Not used with sqlite3. 'NAME': 'sqlite.db'
DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. }
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. }
# Local time zone for this installation. Choices can be found here: # Local time zone for this installation. Choices can be found here:
# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
...@@ -81,26 +81,16 @@ SECRET_KEY = '34958734985734985734985798437' ...@@ -81,26 +81,16 @@ SECRET_KEY = '34958734985734985734985798437'
# List of callables that know how to import templates from various sources. # List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = ( TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.load_template_source', 'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.load_template_source', 'django.template.loaders.app_directories.Loader',
# 'django.template.loaders.eggs.load_template_source', # 'django.template.loaders.eggs.load_template_source',
) )
# django-openid-auth will *not* work with Django 1.1.1 or older, as it's
# missing the csrf_token template tag. This will allow it to work with
# Django 1.1.2 or later:
try:
import django.middleware.csrf
except ImportError:
csrf_middleware = 'django.contrib.csrf.middleware.CsrfViewMiddleware'
else:
csrf_middleware = 'django.middleware.csrf.CsrfViewMiddleware'
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
csrf_middleware, 'django.middleware.csrf.CsrfViewMiddleware',
) )
ROOT_URLCONF = 'example_consumer.urls' ROOT_URLCONF = 'example_consumer.urls'
......
...@@ -76,5 +76,5 @@ setup( ...@@ -76,5 +76,5 @@ setup(
'django_openid_auth': ['templates/openid/*.html'], 'django_openid_auth': ['templates/openid/*.html'],
}, },
provides=['django_openid_auth'], provides=['django_openid_auth'],
requires=['django (>=1.1.2)', 'openid (>=2.2.0)'], requires=['django (>=1.3)', 'openid (>=2.2.0)'],
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment