Fixed #23664 -- Provided a consistent definition for OrderedSet.__bool__

This also defines QuerySet.__bool__ for consistency though this should not have any consequence as bool(qs) used to fallback on QuerySet.__len__ in Py3.

2 files changed, 8 insertions, 2 deletions

diff --git a/django/db/models/query.py b/django/db/models/query.py
index 6dbca8369a..85f1981662 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -162,10 +162,13 @@ class QuerySet(object):
         self._fetch_all()
         return iter(self._result_cache)
 
-    def __nonzero__(self):
+    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.
diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index 2efcd00eb0..49fd9d9848 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -271,9 +271,12 @@ class OrderedSet(object):
     def __contains__(self, item):
         return item in self.dict
 
-    def __nonzero__(self):
+    def __bool__(self):
         return bool(self.dict)
 
+    def __nonzero__(self):      # Python 2 compatibility
+        return type(self).__bool__(self)
+
 
 class MultiValueDictKeyError(KeyError):
     pass