ipaddrset: Define __bool__ and make __nonzero__ an alias

Python3 calls __bool_.  Python2 calls __nonzero__.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/ipaddrset.py b/ipaddrset.py
index 54869580840aa4fa9d53fbbd27164cbaa98f9cd7..84c7dcacdd66aff139f06d05331df374d3a64778 100644 (file)
--- a/ipaddrset.py
+++ b/ipaddrset.py
@@ -68,11 +68,12 @@ class IPAddressSet:
                        self._v[a.version].append(a)
 
        # enquirers including standard comparisons
                        self._v[a.version].append(a)
 
        # enquirers including standard comparisons

-       def __nonzero__(self):
+       def __bool__(self):

                for v in _vsns:
                        if self._v[v]:
                                return True
                return False
                for v in _vsns:
                        if self._v[v]:
                                return True
                return False

+       __nonzero__=__bool__ # for python2

 
        def __eq__(self,other):
                for v in _vsns:
 
        def __eq__(self,other):
                for v in _vsns: