Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 6c915219027ca5785db30767620680380ff9377d 1 parent d1e7409
@alex alex authored
View
1  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
View
11 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)
View
2  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')
Please sign in to comment.
Something went wrong with that request. Please try again.