Merge lp:~cjwatson/storm/py3-bool into lp:storm

[Colin Watson]

Handle Python 3's renaming of __nonzero__ to __bool__.

[Kristian Glass (doismellburning)]

review: Approve

=== modified file 'storm/databases/__init__.py'
--- storm/databases/__init__.py	2019-06-05 11:41:07 +0000
+++ storm/databases/__init__.py	2019-08-11 09:08:59 +0000
@@ -21,6 +21,8 @@
 
 from __future__ import print_function
 
+import six
+
 
 class Dummy(object):
     """Magic "infectious" class.
@@ -38,7 +40,10 @@
     def __add__(self, other):
         return self
 
-    def __nonzero__(self):
+    def __bool__(self):
         return False
 
+    if six.PY2:
+        __nonzero__ = __bool__
+
 dummy = Dummy()
 
=== modified file 'storm/sqlobject.py'
--- storm/sqlobject.py	2019-06-05 11:41:07 +0000
+++ storm/sqlobject.py	2019-08-11 09:08:59 +0000
@@ -28,6 +28,8 @@
 import re
 import warnings
 
+import six
+
 from storm.properties import (
     RawStr, Int, Bool, Float, DateTime, Date, TimeDelta)
 from storm.references import Reference, ReferenceSet
@@ -550,15 +552,18 @@
         result_set = self._without_prejoins()._result_set
         return item in result_set
 
-    def __nonzero__(self):
+    def __bool__(self):
         """Return C{True} if this result set contains any results.
 
         @note: This method is provided for compatibility with SQL Object.  For
             new code, prefer L{is_empty}.  It's compatible with L{ResultSet}
-            which doesn't have a C{__nonzero__} implementation.
+            which doesn't have a C{__bool__} implementation.
         """
         return not self.is_empty()
 
+    if six.PY2:
+        __nonzero__ = __bool__
+
     def is_empty(self):
         """Return C{True} if this result set doesn't contain any results."""
         result_set = self._without_prejoins()._result_set
 
=== modified file 'storm/zope/interfaces.py'
--- storm/zope/interfaces.py	2019-06-05 11:41:07 +0000
+++ storm/zope/interfaces.py	2019-08-11 09:08:59 +0000
@@ -20,6 +20,7 @@
 #
 from __future__ import print_function
 
+import six
 from zope.interface import Interface
 
 from storm.expr import Undef
@@ -165,14 +166,17 @@
     def count():
        """Return the number of items in the result set."""
 
-    def __nonzero__():
+    def __bool__():
         """Return C{True} if this result set contains any results.
 
         @note: This method is provided for compatibility with SQL Object.  For
             new code, prefer L{is_empty}.  It's compatible with L{ResultSet}
-            which doesn't have a C{__nonzero__} implementation.
+            which doesn't have a C{__bool__} implementation.
         """
 
+    if six.PY2:
+        __nonzero__ = __bool__
+
     def __contains__(item):
        """Support C{if FooObject in Foo.select(query)}."""
 
 
=== modified file 'tests/mocker.py'
--- tests/mocker.py	2019-06-07 17:14:33 +0000
+++ tests/mocker.py	2019-08-11 09:08:59 +0000
@@ -13,6 +13,7 @@
 import os
 import gc
 
+import six
 from six.moves import builtins
 
 
@@ -1083,12 +1084,15 @@
             return 0
         return result
 
-    def __nonzero__(self):
+    def __bool__(self):
         try:
-            return self.__mocker_act__("nonzero")
+            return self.__mocker_act__("bool")
         except MatchError as e:
             return True
 
+    if six.PY2:
+        __nonzero__ = __bool__
+
     def __iter__(self):
         # XXX On py3k, when next() becomes __next__(), we'll be able
         #     to return the mock itself because it will be considered
@@ -1187,7 +1191,7 @@
                 result = None
             elif kind == "len":
                 result = len(object)
-            elif kind == "nonzero":
+            elif kind == "bool":
                 result = bool(object)
             elif kind == "iter":
                 result = iter(object)
@@ -1280,7 +1284,7 @@
                 result = "del %s[%r]" % (result, action.args[0])
             elif action.kind == "len":
                 result = "len(%s)" % result
-            elif action.kind == "nonzero":
+            elif action.kind == "bool":
                 result = "bool(%s)" % result
             elif action.kind == "iter":
                 result = "iter(%s)" % result
 
=== modified file 'tests/sqlobject.py'
--- tests/sqlobject.py	2019-06-05 11:41:07 +0000
+++ tests/sqlobject.py	2019-08-11 09:08:59 +0000
@@ -23,6 +23,8 @@
 import datetime
 import operator
 
+import six
+
 from storm.database import create_database
 from storm.exceptions import NoneError
 from storm.sqlobject import *
@@ -813,16 +815,20 @@
         result = self.Person.select()
         self.assertEquals(list(result.__iter__())[0].name, "John Joe")
 
-    def test_result_set__nonzero__(self):
+    def test_result_set__bool__(self):
         """
-        L{SQLObjectResultSet.__nonzero__} returns C{True} if the result set
+        L{SQLObjectResultSet.__bool__} returns C{True} if the result set
         contains results.  If it contains no results, C{False} is
         returned.
         """
         result = self.Person.select()
-        self.assertEquals(result.__nonzero__(), True)
+        self.assertEquals(result.__bool__(), True)
+        if six.PY2:
+            self.assertEquals(result.__nonzero__(), True)
         result = self.Person.select(self.Person.q.name == "No Person")
-        self.assertEquals(result.__nonzero__(), False)
+        self.assertEquals(result.__bool__(), False)
+        if six.PY2:
+            self.assertEquals(result.__nonzero__(), False)
 
     def test_result_set_is_empty(self):
         """