summaryrefslogtreecommitdiff
path: root/django/utils/itercompat.py
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/utils/itercompat.py
parent227cec686e512412f613c3d14743b85445765d92 (diff)
Fixed #18042 -- Advanced deprecation warnings.
Thanks Ramiro for the patch.
Diffstat (limited to 'django/utils/itercompat.py')
-rw-r--r--django/utils/itercompat.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/django/utils/itercompat.py b/django/utils/itercompat.py
index dd47b7df24..2f016b1c3f 100644
--- a/django/utils/itercompat.py
+++ b/django/utils/itercompat.py
@@ -18,18 +18,16 @@ def is_iterable(x):
return True
def product(*args, **kwds):
- # PendingDeprecationWarning in 1.5, remove this comment when the Deprecations
- # will have been advanced for 1.5
warnings.warn("django.utils.itercompat.product is deprecated; use the native version instead",
PendingDeprecationWarning)
return itertools.product(*args, **kwds)
def all(iterable):
warnings.warn("django.utils.itercompat.all is deprecated; use the native version instead",
- PendingDeprecationWarning)
+ DeprecationWarning)
return __builtin__.all(iterable)
def any(iterable):
warnings.warn("django.utils.itercompat.any is deprecated; use the native version instead",
- PendingDeprecationWarning)
+ DeprecationWarning)
return __builtin__.any(iterable)