Permalink
Browse files

Refs #23919 -- Removed __nonzero__() methods (for Python 2).

Thanks Tim for the review.
  • Loading branch information...
charettes committed Jan 19, 2017
1 parent 53f3d53 commit 4c5ed3e683576ece880ae99398a1e7d8c5829617
@@ -20,9 +20,6 @@ def __iter__(self):
def __bool__(self):
return self.user.has_module_perms(self.app_label)
- def __nonzero__(self): # Python 2 compatibility
- return type(self).__bool__(self)
-
class PermWrapper:
def __init__(self, user):
@@ -175,9 +175,6 @@ def __idiv__(self, other): # Python 2 compatibility
def __bool__(self):
return bool(self.standard)
- def __nonzero__(self): # Python 2 compatibility
- return type(self).__bool__(self)
-
def default_units(self, kwargs):
"""
Return the unit value and the default units specified
@@ -25,9 +25,6 @@ def __repr__(self):
def __bool__(self):
return bool(self.name)
- def __nonzero__(self): # Python 2 compatibility
- return type(self).__bool__(self)
-
def __len__(self):
return self.size
@@ -149,9 +146,6 @@ def __str__(self):
def __bool__(self):
return True
- def __nonzero__(self): # Python 2 compatibility
- return type(self).__bool__(self)
-
def open(self, mode=None):
self.seek(0)
@@ -253,9 +253,6 @@ def __bool__(self):
self._fetch_all()
return bool(self._result_cache)
- def __nonzero__(self): # Python 2 compatibility
- return type(self).__bool__(self)
-
def __getitem__(self, k):
"""
Retrieves an item or slice from the set of results.
View
@@ -78,9 +78,6 @@ def __bool__(self):
"""All formsets have a management form which is not included in the length"""
return True
- def __nonzero__(self): # Python 2 compatibility
- return type(self).__bool__(self)
-
@cached_property
def management_form(self):
"""Returns the ManagementForm instance for this FormSet."""
@@ -32,9 +32,6 @@ def __contains__(self, item):
def __bool__(self):
return bool(self.dict)
- def __nonzero__(self): # Python 2 compatibility
- return type(self).__bool__(self)
-
def __len__(self):
return len(self.dict)
@@ -114,9 +114,6 @@ class NumberAwareString(resultclass):
def __bool__(self):
return bool(kwargs['singular'])
- def __nonzero__(self): # Python 2 compatibility
- return type(self).__bool__(self)
-
def __mod__(self, rhs):
if isinstance(rhs, dict) and number:
try:
View
@@ -71,9 +71,6 @@ def __bool__(self):
"""
return bool(self.children)
- def __nonzero__(self): # Python 2 compatibility
- return type(self).__bool__(self)
-
def __contains__(self, other):
"""
Returns True is 'other' is a direct child of this instance.
@@ -121,9 +121,8 @@ class Guild(models.Model):
name = models.CharField(max_length=15)
members = models.ManyToManyField(Developer)
- def __nonzero__(self):
-
- return self.members.count()
+ def __bool__(self):
+ return False
class Tag(models.Model):
@@ -119,10 +119,12 @@ def test_target_model_len_zero(self):
note = Note(note='Deserve a bonus', content_object=team1)
note.save()
- def test_target_model_nonzero_false(self):
- """Test related to #13085"""
- # __nonzero__() returns False -- This actually doesn't currently fail.
- # This test validates that
+ def test_target_model_bool_false(self):
+ """
+ Saving a model with a GenericForeignKey to a model instance whose
+ __bool__ method returns False (Guild.__bool__() here) shouldn't fail
+ (#13085).
+ """
g1 = Guild.objects.create(name='First guild')
note = Note(note='Note for guild', content_object=g1)
note.save()

0 comments on commit 4c5ed3e

Please sign in to comment.