p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prevented Django from running with an empty secret key. Refs #17800. 

This accelerated deprecation schedule was documented in r17617.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Aymeric Augustin 2012-03-31 11:44:57 +00:00
parent a1ffb02107
commit 9e11ff2665
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/conf/__init__.py
View File

@ -12,6 +12,7 @@ import time # Needed for Windows
import warnings import warnings
from django.conf import global_settings from django.conf import global_settings
from django.core.exceptions import ImproperlyConfigured
from django.utils.functional import LazyObject, empty from django.utils.functional import LazyObject, empty
from django.utils import importlib from django.utils import importlib
@ -107,7 +108,7 @@ class Settings(BaseSettings):
setattr(self, setting, setting_value) setattr(self, setting, setting_value)
if not self.SECRET_KEY: if not self.SECRET_KEY:
warnings.warn("The SECRET_KEY setting must not be empty.", DeprecationWarning) raise ImproperlyConfigured("The SECRET_KEY setting must not be empty.")
if hasattr(time, 'tzset') and self.TIME_ZONE: if hasattr(time, 'tzset') and self.TIME_ZONE:
# When we can, attempt to validate the timezone. If we can't find # When we can, attempt to validate the timezone. If we can't find