[py3] Replaced __nonzero__ by __bool__

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

1 files changed, 4 insertions, 2 deletions

diff --git a/django/core/files/base.py b/django/core/files/base.py
index 37b1be89b3..d0b25250a5 100644
--- a/django/core/files/base.py
+++ b/django/core/files/base.py
@@ -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)