From 4bb2bf2bbd4cf90fb4bc3f2aa917ce60d00e65c6 Mon Sep 17 00:00:00 2001 From: Tomas Olander Date: Mon, 18 Apr 2016 21:20:34 +0200 Subject: [PATCH] Don't import dev in project template settings Developer settings were always imported whenever any portion of the project template settings package itself was imported. Using production settings would result in __init__.py importing the dev settings first, *then* overriding those with the production settings. This lead to somewhat counter-intuitive behaviour - dev settings that weren't explicitly set again in production would tag along to prod. To fix this, the project template settings package no longer imports dev, and settings.dev is explicitly used in both manage.py and wsgi.py. --- wagtail/project_template/manage.py | 2 +- wagtail/project_template/project_name/settings/__init__.py | 1 - wagtail/project_template/project_name/wsgi.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/wagtail/project_template/manage.py b/wagtail/project_template/manage.py index 493f38dfb..d5c36a9c0 100755 --- a/wagtail/project_template/manage.py +++ b/wagtail/project_template/manage.py @@ -5,7 +5,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings.dev") from django.core.management import execute_from_command_line diff --git a/wagtail/project_template/project_name/settings/__init__.py b/wagtail/project_template/project_name/settings/__init__.py index c7873286a..e69de29bb 100644 --- a/wagtail/project_template/project_name/settings/__init__.py +++ b/wagtail/project_template/project_name/settings/__init__.py @@ -1 +0,0 @@ -from .dev import * diff --git a/wagtail/project_template/project_name/wsgi.py b/wagtail/project_template/project_name/wsgi.py index b6340f336..f58f6b154 100644 --- a/wagtail/project_template/project_name/wsgi.py +++ b/wagtail/project_template/project_name/wsgi.py @@ -13,6 +13,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings.dev") application = get_wsgi_application()