From 7c5ca8d3993ce4f00ed160f15e701a06cc307911 Mon Sep 17 00:00:00 2001 From: Scott Bragg Date: Wed, 29 Jun 2016 23:22:46 +1000 Subject: [PATCH] settings.py allows local_settings.py to extend settings (used for Raven/Sentry config) --- pinaxcon/settings.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index ff36bb1b..e0493710 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -264,6 +264,9 @@ NOSE_ARGS = [ # Production settings have their own file to override stuff here try: - from local_settings import * -except ImportError: - pass + LOCAL_SETTINGS +except NameError: + try: + from local_settings import * + except ImportError: + pass \ No newline at end of file