Python 3 compatible boolean conversions

3 files changed, 12 insertions, 3 deletions

diff --git a/openid/extensions/draft/pape2.py b/openid/extensions/draft/pape2.py
index 529f329..e8dec91 100644
--- a/openid/extensions/draft/pape2.py
+++ b/openid/extensions/draft/pape2.py
@@ -62,10 +62,13 @@ class Request(Extension):
         self.preferred_auth_policies = preferred_auth_policies
         self.max_auth_age = max_auth_age
 
-    def __nonzero__(self):
+    def __bool__(self):
         return bool(self.preferred_auth_policies or
                     self.max_auth_age is not None)
 
+    def __nonzero__(self):
+        return self.__bool__()
+
     def addPolicyURI(self, policy_uri):
         """Add an acceptable authentication policy URI to this request
 
diff --git a/openid/extensions/pape.py b/openid/extensions/pape.py
index b9c3812..d834824 100644
--- a/openid/extensions/pape.py
+++ b/openid/extensions/pape.py
@@ -130,11 +130,14 @@ class Request(PAPEExtension):
             for auth_level in preferred_auth_level_types:
                 self.addAuthLevel(auth_level)
 
-    def __nonzero__(self):
+    def __bool__(self):
         return bool(self.preferred_auth_policies or
                     self.max_auth_age is not None or
                     self.preferred_auth_level_types)
 
+    def __nonzero__(self):
+        return self.__bool__()
+
     def addPolicyURI(self, policy_uri):
         """Add an acceptable authentication policy URI to this request
 
diff --git a/openid/extensions/sreg.py b/openid/extensions/sreg.py
index 1c5e9d6..c557e21 100644
--- a/openid/extensions/sreg.py
+++ b/openid/extensions/sreg.py
@@ -524,5 +524,8 @@ class SRegResponse(Extension):
         checkFieldName(field_name)
         return self.data[field_name]
 
-    def __nonzero__(self):
+    def __bool__(self):
         return bool(self.data)
+
+    def __nonzero__(self):
+        return self.__bool__()