From 6c915219027ca5785db30767620680380ff9377d Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 14 Oct 2011 00:20:50 +0000
Subject: [PATCH] Remove the usage of deprecated function in Django. Also
 simplify the fallback code.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/auth/forms.py               |  1 -
 django/utils/itercompat.py                 | 11 +++--------
 tests/regressiontests/admin_views/tests.py |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py
index 9602d55736588..b97c5d7054f8f 100644
--- a/django/contrib/auth/forms.py
+++ b/django/contrib/auth/forms.py
@@ -1,7 +1,6 @@
 from django import forms
 from django.template import loader
 from django.utils.http import int_to_base36
-from django.utils.itercompat import any
 from django.utils.translation import ugettext_lazy as _
 
 from django.contrib.auth.models import User
diff --git a/django/utils/itercompat.py b/django/utils/itercompat.py
index a56b703983f37..82434b7c9b8bf 100644
--- a/django/utils/itercompat.py
+++ b/django/utils/itercompat.py
@@ -4,6 +4,7 @@
 these implementations if necessary.
 """
 
+import __builtin__
 import itertools
 import warnings
 
@@ -36,15 +37,9 @@ def is_iterable(x):
 def all(iterable):
     warnings.warn("django.utils.itercompat.all is deprecated; use the native version instead",
                   PendingDeprecationWarning)
-    for item in iterable:
-        if not item:
-            return False
-    return True
+    return __builtin__.all(iterable)
 
 def any(iterable):
     warnings.warn("django.utils.itercompat.any is deprecated; use the native version instead",
                   PendingDeprecationWarning)
-    for item in iterable:
-        if item:
-            return True
-    return False
+    return __builtin__.any(iterable)
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index 52664a0207ab6..3e9b26d6fc2e1 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -135,7 +135,7 @@ def testPopupAddPost(self):
             'date_1': u'14:55:39',
         }
         response = self.client.post('/test_admin/%s/admin_views/article/add/' % self.urlbit, post_data)
-        self.failUnlessEqual(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
         self.assertContains(response, 'dismissAddAnotherPopup')
         self.assertContains(response, 'title with a new\u000Aline')