From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 18 Oct 2019 20:34:13 +0000 (+0100)
Subject: ipaddrset: Define __bool__ and make __nonzero__ an alias
X-Git-Tag: v0.5.0~31
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=58957a596533797cb9502de88cd84003abeb06f7;p=secnet.git

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 5486958..84c7dca 100644
--- a/ipaddrset.py
+++ b/ipaddrset.py
@@ -68,11 +68,12 @@ class IPAddressSet:
 			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
+	__nonzero__=__bool__ # for python2
 
 	def __eq__(self,other):
 		for v in _vsns: