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

Thanks Tim for the review.
This commit is contained in:
Simon Charette 2017-01-19 09:55:03 -05:00
parent 53f3d53ed4
commit 4c5ed3e683
10 changed files with 8 additions and 34 deletions

View File

@ -20,9 +20,6 @@ class PermLookupDict:
def __bool__(self): def __bool__(self):
return self.user.has_module_perms(self.app_label) return self.user.has_module_perms(self.app_label)
def __nonzero__(self): # Python 2 compatibility
return type(self).__bool__(self)
class PermWrapper: class PermWrapper:
def __init__(self, user): def __init__(self, user):

View File

@ -175,9 +175,6 @@ class MeasureBase:
def __bool__(self): def __bool__(self):
return bool(self.standard) return bool(self.standard)
def __nonzero__(self): # Python 2 compatibility
return type(self).__bool__(self)
def default_units(self, kwargs): def default_units(self, kwargs):
""" """
Return the unit value and the default units specified Return the unit value and the default units specified

View File

@ -25,9 +25,6 @@ class File(FileProxyMixin):
def __bool__(self): def __bool__(self):
return bool(self.name) return bool(self.name)
def __nonzero__(self): # Python 2 compatibility
return type(self).__bool__(self)
def __len__(self): def __len__(self):
return self.size return self.size
@ -149,9 +146,6 @@ class ContentFile(File):
def __bool__(self): def __bool__(self):
return True return True
def __nonzero__(self): # Python 2 compatibility
return type(self).__bool__(self)
def open(self, mode=None): def open(self, mode=None):
self.seek(0) self.seek(0)

View File

@ -253,9 +253,6 @@ class QuerySet:
self._fetch_all() self._fetch_all()
return bool(self._result_cache) return bool(self._result_cache)
def __nonzero__(self): # Python 2 compatibility
return type(self).__bool__(self)
def __getitem__(self, k): def __getitem__(self, k):
""" """
Retrieves an item or slice from the set of results. Retrieves an item or slice from the set of results.

View File

@ -78,9 +78,6 @@ class BaseFormSet:
"""All formsets have a management form which is not included in the length""" """All formsets have a management form which is not included in the length"""
return True return True
def __nonzero__(self): # Python 2 compatibility
return type(self).__bool__(self)
@cached_property @cached_property
def management_form(self): def management_form(self):
"""Returns the ManagementForm instance for this FormSet.""" """Returns the ManagementForm instance for this FormSet."""

View File

@ -32,9 +32,6 @@ class OrderedSet:
def __bool__(self): def __bool__(self):
return bool(self.dict) return bool(self.dict)
def __nonzero__(self): # Python 2 compatibility
return type(self).__bool__(self)
def __len__(self): def __len__(self):
return len(self.dict) return len(self.dict)

View File

@ -114,9 +114,6 @@ def lazy_number(func, resultclass, number=None, **kwargs):
def __bool__(self): def __bool__(self):
return bool(kwargs['singular']) return bool(kwargs['singular'])
def __nonzero__(self): # Python 2 compatibility
return type(self).__bool__(self)
def __mod__(self, rhs): def __mod__(self, rhs):
if isinstance(rhs, dict) and number: if isinstance(rhs, dict) and number:
try: try:

View File

@ -71,9 +71,6 @@ class Node:
""" """
return bool(self.children) return bool(self.children)
def __nonzero__(self): # Python 2 compatibility
return type(self).__bool__(self)
def __contains__(self, other): def __contains__(self, other):
""" """
Returns True is 'other' is a direct child of this instance. Returns True is 'other' is a direct child of this instance.

View File

@ -121,9 +121,8 @@ class Guild(models.Model):
name = models.CharField(max_length=15) name = models.CharField(max_length=15)
members = models.ManyToManyField(Developer) members = models.ManyToManyField(Developer)
def __nonzero__(self): def __bool__(self):
return False
return self.members.count()
class Tag(models.Model): class Tag(models.Model):

View File

@ -119,10 +119,12 @@ class GenericRelationTests(TestCase):
note = Note(note='Deserve a bonus', content_object=team1) note = Note(note='Deserve a bonus', content_object=team1)
note.save() note.save()
def test_target_model_nonzero_false(self): def test_target_model_bool_false(self):
"""Test related to #13085""" """
# __nonzero__() returns False -- This actually doesn't currently fail. Saving a model with a GenericForeignKey to a model instance whose
# This test validates that __bool__ method returns False (Guild.__bool__() here) shouldn't fail
(#13085).
"""
g1 = Guild.objects.create(name='First guild') g1 = Guild.objects.create(name='First guild')
note = Note(note='Note for guild', content_object=g1) note = Note(note='Note for guild', content_object=g1)
note.save() note.save()