summaryrefslogtreecommitdiff
path: root/django/core
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@polyconseil.fr>2012-05-03 15:27:01 +0200
committerAymeric Augustin <aymeric.augustin@polyconseil.fr>2012-05-03 15:27:01 +0200
commite84f79f05113f546810c1908c7baef99fb1e874a (patch)
tree4cb5f3e428caa894bd9acc06fc3cd6250b018715 /django/core
parent227cec686e512412f613c3d14743b85445765d92 (diff)
Fixed #18042 -- Advanced deprecation warnings.
Thanks Ramiro for the patch.
Diffstat (limited to 'django/core')
-rw-r--r--django/core/cache/backends/memcached.py2
-rw-r--r--django/core/management/__init__.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py
index aa1b4513c0..951c1eda26 100644
--- a/django/core/cache/backends/memcached.py
+++ b/django/core/cache/backends/memcached.py
@@ -130,7 +130,7 @@ class CacheClass(BaseMemcachedCache):
import warnings
warnings.warn(
"memcached.CacheClass has been split into memcached.MemcachedCache and memcached.PyLibMCCache. Please update your cache backend setting.",
- PendingDeprecationWarning
+ DeprecationWarning
)
try:
import memcache
diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py
index b4e82e454f..0464eb27bb 100644
--- a/django/core/management/__init__.py
+++ b/django/core/management/__init__.py
@@ -395,7 +395,7 @@ def setup_environ(settings_mod, original_settings_path=None):
"you likely need to update your 'manage.py'; "
"please see the Django 1.4 release notes "
"(https://docs.djangoproject.com/en/dev/releases/1.4/).",
- PendingDeprecationWarning)
+ DeprecationWarning)
# Add this project to sys.path so that it's importable in the conventional
# way. For example, if this file (manage.py) lives in a directory
@@ -451,7 +451,7 @@ def execute_manager(settings_mod, argv=None):
"you likely need to update your 'manage.py'; "
"please see the Django 1.4 release notes "
"(https://docs.djangoproject.com/en/dev/releases/1.4/).",
- PendingDeprecationWarning)
+ DeprecationWarning)
setup_environ(settings_mod)
utility = ManagementUtility(argv)