summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2012-03-15 16:50:29 +0000
committerCarl Meyer <carl@oddbird.net>2012-03-15 16:50:29 +0000
commite41fcdd4d9d687b6e6ed481b7a5378ae65f5e0f4 (patch)
treea38f724610a9284a608be20156bfe397542f0467
parentb018128ea5f9ad494afb0007c597bc61630dc087 (diff)
Actually warn on empty SECRET_KEY instead of raising a warning as an exception.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index e16f11e9f9..a3f7ee00a0 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -107,7 +107,7 @@ class Settings(BaseSettings):
setattr(self, setting, setting_value)
if not self.SECRET_KEY:
- raise DeprecationWarning("The SECRET_KEY setting must not be empty.")
+ warnings.warn("The SECRET_KEY setting must not be empty.", DeprecationWarning)
if hasattr(time, 'tzset') and self.TIME_ZONE:
# When we can, attempt to validate the timezone. If we can't find