From c641660e041fdf932bad89681c167328ee85249a Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 7 Apr 2015 22:20:52 +0100 Subject: settings: Restructure settings file Restructure to add some order to the settings file. This includes removing some variables: - TEMPLATE_CONTEXT_PROCESSORS - TEMPLATE_LOADERS These variables have the exact same value as the Django defaults and thus do not need to be specified. Signed-off-by: Stephen Finucane Signed-off-by: Jeremy Kerr --- apps/settings.py | 141 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 78 insertions(+), 63 deletions(-) diff --git a/apps/settings.py b/apps/settings.py index 9dbac19..dbe0544 100644 --- a/apps/settings.py +++ b/apps/settings.py @@ -1,9 +1,52 @@ # Django settings for patchwork project. + import os + import django +ROOT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir) + +# +# Core settings +# https://docs.djangoproject.com/en/1.6/ref/settings/#core-settings +# + +# Models + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.admin', + 'patchwork', +) + +# HTTP + +MIDDLEWARE_CLASSES = [ + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', +] + +if django.VERSION < (1, 7): + MIDDLEWARE_CLASSES.append('django.middleware.doc.XViewMiddleware') +else: + MIDDLEWARE_CLASSES.append( + 'django.contrib.admindocs.middleware.XViewMiddleware') + TEST_RUNNER = 'django.test.runner.DiscoverRunner' + +# Debugging + DEBUG = True -TEMPLATE_DEBUG = DEBUG + +if django.VERSION >= (1, 7): + TEST_RUNNER = 'django.test.runner.DiscoverRunner' + +# Email ADMINS = ( ('Jeremy Kerr', 'jk@ozlabs.org'), @@ -11,6 +54,8 @@ ADMINS = ( MANAGERS = ADMINS +# Databases + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', @@ -18,89 +63,59 @@ DATABASES = { }, } -# 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 -# although not all variations may be possible on all operating systems. -# If running in a Windows environment this must be set to the same as your -# system time zone. +# File Uploads + +MEDIA_ROOT = os.path.join( + ROOT_DIR, 'lib', 'python', 'django', 'contrib', 'admin', 'media') + +# Globalization + TIME_ZONE = 'Australia/Canberra' -# Language code for this installation. All choices can be found here: -# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes -# http://blogs.law.harvard.edu/tech/stories/storyReader$15 LANGUAGE_CODE = 'en-au' -SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. USE_I18N = True -# URL that handles the media served from MEDIA_ROOT. -# Example: "http://media.lawrence.com" -MEDIA_URL = '' +# URLs -# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a -# trailing slash. -# Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = '/media/' +ROOT_URLCONF = 'urls' + +# Security # Make this unique, and don't share it with anybody. SECRET_KEY = '00000000000000000000000000000000000000000000000000' -# 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', +# Templates + +TEMPLATE_DEBUG = True + +TEMPLATE_DIRS = ( + os.path.join(ROOT_DIR, 'templates'), ) -MIDDLEWARE_CLASSES = [ - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.doc.XViewMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', -] -if django.VERSION < (1, 7): - MIDDLEWARE_CLASSES.append('django.middleware.doc.XViewMiddleware') -else: - MIDDLEWARE_CLASSES.append( - 'django.contrib.admindocs.middleware.XViewMiddleware') - TEST_RUNNER = 'django.test.runner.DiscoverRunner' +# +# Auth settings +# https://docs.djangoproject.com/en/1.6/ref/settings/#auth +# -ROOT_URLCONF = 'urls' +ADMIN_MEDIA_PREFIX = '/media/' LOGIN_URL = '/user/login/' LOGIN_REDIRECT_URL = '/user/' -ROOT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir) -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. - os.path.join(ROOT_DIR, 'templates'), -) -# Absolute path to the directory that holds media. -# Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = os.path.join( - ROOT_DIR, 'lib', 'python', 'django', 'contrib', 'admin', 'media') -TEMPLATE_CONTEXT_PROCESSORS = ( - "django.contrib.auth.context_processors.auth", - "django.core.context_processors.debug", - "django.core.context_processors.i18n", - "django.core.context_processors.media") +# +# Sites settings +# https://docs.djangoproject.com/en/1.6/ref/settings/#sites +# -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.admin', - 'patchwork', -) +SITE_ID = 1 + + +# +# Patchwork settings +# DEFAULT_PATCHES_PER_PAGE = 100 DEFAULT_FROM_EMAIL = 'Patchwork ' -- cgit v1.2.3