Commit 576ec12f authored by Claude Paroz's avatar Claude Paroz
Browse files

[py3] Replaced __nonzero__ by __bool__ 

Of course, __nonzero__ alias has been kept for Python 2 compatibility.
parent 12cda89f

django/contrib/auth/context_processors.py

+2 −1
Original line number Diff line number Diff line
@@ -11,8 +11,9 @@ class PermLookupDict(object): 
    def __getitem__(self, perm_name):

        return self.user.has_perm("%s.%s" % (self.module_name, perm_name))



    def __nonzero__(self):

    def __bool__(self):

        return self.user.has_module_perms(self.module_name)

    __nonzero__ = __bool__ # Python 2





class PermWrapper(object):

django/core/files/base.py

+4 −2
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ class File(FileProxyMixin): 
    def __repr__(self):

        return "<%s: %s>" % (self.__class__.__name__, self or "None")



    def __nonzero__(self):

    def __bool__(self):

        return bool(self.name)

    __nonzero__ = __bool__ # Python 2



    def __len__(self):

        return self.size
@@ -135,8 +136,9 @@ class ContentFile(File): 
    def __str__(self):

        return 'Raw content'



    def __nonzero__(self):

    def __bool__(self):

        return True

    __nonzero__ = __bool__ # Python 2



    def open(self, mode=None):

        self.seek(0)

django/db/models/query.py

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ class QuerySet(object): 
            if len(self._result_cache) <= pos:

                self._fill_cache()



    def __nonzero__(self):

    def __bool__(self):

        if self._prefetch_related_lookups and not self._prefetch_done:

            # We need all the results in order to be able to do the prefetch

            # in one go. To minimize code duplication, we use the __len__
@@ -134,6 +134,7 @@ class QuerySet(object): 
        except StopIteration:

            return False

        return True

    __nonzero__ = __bool__ # Python 2



    def __contains__(self, val):

        # The 'in' operator works without this method, due to __iter__. This

django/dispatch/saferef.py

+2 −1
Original line number Diff line number Diff line
@@ -152,9 +152,10 @@ class BoundMethodWeakref(object): 
    

    __repr__ = __str__

    

    def __nonzero__( self ):

    def __bool__( self ):

        """Whether we are still a valid reference"""

        return self() is not None

    __nonzero__ = __bool__ # Python 2



    def __eq__(self, other):

        """Compare with another reference"""

django/forms/formsets.py

+2 −1
Original line number Diff line number Diff line
@@ -65,9 +65,10 @@ class BaseFormSet(StrAndUnicode): 
    def __len__(self):

        return len(self.forms)



    def __nonzero__(self):

    def __bool__(self):

        """All formsets have a management form which is not included in the length"""

        return True

    __nonzero__ = __bool__ # Python 2



    def _management_form(self):

        """Returns the ManagementForm instance for this FormSet."""