diff options
| author | Tim Graham <timograham@gmail.com> | 2018-05-26 20:58:41 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-05-26 21:07:19 -0400 |
| commit | 483f5d6c4f66c8dfca5770de7b1af8aea05a5e7c (patch) | |
| tree | b3bffa86aa0fd8c906f4fd490a9b77ce32a27c89 /docs/ref | |
| parent | 39e61669e0c4299228dca751852002946ebe5d5e (diff) | |
[2.1.x] Reverted "Fixed #29324 -- Made Settings raise ImproperlyConfigured if SECRET_KEY is accessed and not set."
This reverts commit b3cffde5559c4fa97625512d7ec41a674be26076 due to
a regression and performance concerns.
Backport of 5cc81cd9eb69f5f7a711412c02039b435c393135 from master
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/settings.txt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 635cadc848..3647e60663 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2074,7 +2074,7 @@ object. See :ref:`how-django-processes-a-request` for details. ``SECRET_KEY`` -------------- -Default: Not defined +Default: ``''`` (Empty string) A secret key for a particular Django installation. This is used to provide :doc:`cryptographic signing </topics/signing>`, and should be set to a unique, @@ -2087,9 +2087,7 @@ Uses of the key shouldn't assume that it's text or bytes. Every use should go through :func:`~django.utils.encoding.force_text` or :func:`~django.utils.encoding.force_bytes` to convert it to the desired type. -Django will refuse to start if :setting:`SECRET_KEY` is set to an empty value. -:class:`~django.core.exceptions.ImproperlyConfigured` is raised if -``SECRET_KEY`` is accessed but not set. +Django will refuse to start if :setting:`SECRET_KEY` is not set. .. warning:: @@ -2122,10 +2120,6 @@ affect them. startproject <startproject>` creates a unique ``SECRET_KEY`` for convenience. -.. versionchanged:: 2.1 - - In older versions, ``SECRET_KEY`` defaults to an empty string. - .. setting:: SECURE_BROWSER_XSS_FILTER ``SECURE_BROWSER_XSS_FILTER`` |