summaryrefslogtreecommitdiff
path: root/django/conf/__init__.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-12-25 21:07:27 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-12-29 21:59:07 +0100
commitef017a5f00d9e84059e00e8fea123be51b293f75 (patch)
treeff0bf6ebfb015465e1ceee3d2551f1c7a200d07f /django/conf/__init__.py
parent130829334c32f48b9ba6e6251d0e780c0d99cd4d (diff)
Advanced pending deprecation warnings.
Also added stacklevel argument, fixed #18127.
Diffstat (limited to 'django/conf/__init__.py')
-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 ccf7a94af6..bbcc16e120 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -139,7 +139,7 @@ class Settings(BaseSettings):
isinstance(setting_value, six.string_types):
warnings.warn("The %s setting must be a tuple. Please fix your "
"settings, as auto-correction is now deprecated." % setting,
- PendingDeprecationWarning)
+ DeprecationWarning, stacklevel=2)
setting_value = (setting_value,) # In case the user forgot the comma.
setattr(self, setting, setting_value)