summaryrefslogtreecommitdiff
path: root/django/core
diff options
context:
space:
mode:
Diffstat (limited to 'django/core')
-rw-r--r--django/core/cache/backends/memcached.py2
-rw-r--r--django/core/context_processors.py2
-rw-r--r--django/core/mail/__init__.py2
-rw-r--r--django/core/management/commands/test.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py
index 7d6b5b362b..cd14fdaf95 100644
--- a/django/core/cache/backends/memcached.py
+++ b/django/core/cache/backends/memcached.py
@@ -10,7 +10,7 @@ try:
import warnings
warnings.warn(
"Support for the 'cmemcache' library has been deprecated. Please use python-memcached instead.",
- PendingDeprecationWarning
+ DeprecationWarning
)
except ImportError:
try:
diff --git a/django/core/context_processors.py b/django/core/context_processors.py
index a5f29dfb2d..7a59728bfc 100644
--- a/django/core/context_processors.py
+++ b/django/core/context_processors.py
@@ -24,7 +24,7 @@ def auth(request):
"The context processor at `django.core.context_processors.auth` is " \
"deprecated; use the path `django.contrib.auth.context_processors.auth` " \
"instead.",
- PendingDeprecationWarning
+ DeprecationWarning
)
from django.contrib.auth.context_processors import auth as auth_context_processor
return auth_context_processor(request)
diff --git a/django/core/mail/__init__.py b/django/core/mail/__init__.py
index f9d1210791..d7a868dfc2 100644
--- a/django/core/mail/__init__.py
+++ b/django/core/mail/__init__.py
@@ -106,6 +106,6 @@ class SMTPConnection(_SMTPConnection):
import warnings
warnings.warn(
'mail.SMTPConnection is deprecated; use mail.get_connection() instead.',
- PendingDeprecationWarning
+ DeprecationWarning
)
super(SMTPConnection, self).__init__(*args, **kwds)
diff --git a/django/core/management/commands/test.py b/django/core/management/commands/test.py
index 6d0a5d8e2e..1431f0059f 100644
--- a/django/core/management/commands/test.py
+++ b/django/core/management/commands/test.py
@@ -29,7 +29,7 @@ class Command(BaseCommand):
import warnings
warnings.warn(
'Function-based test runners are deprecated. Test runners should be classes with a run_tests() method.',
- PendingDeprecationWarning
+ DeprecationWarning
)
failures = TestRunner(test_labels, verbosity=verbosity, interactive=interactive)
else: