Python 3 preparation: use __bool__ instead of __nonzero__.

Tool-assisted patch.  __nonzero__ = __bool__ included for Python 2
compatibility.

Author: jsm28

roundup/cgi/templating.py

@@ -1343,8 +1343,10 @@ def __cmp__(self, other):
             return cmp(self._value, other._value)
         return cmp(self._value, other)
 
-    def __nonzero__(self):
+    def __bool__(self):
         return not not self._value
+    # Python 2 compatibility:
+    __nonzero__ = __bool__
 
     def isset(self):
         """Is my _value not None?"""
@@ -3224,7 +3226,9 @@ def __getattr__(self, name):
         return getattr(self, name)
 
     def __getitem__(self, key): return self
-    def __nonzero__(self): return 0
+    def __bool__(self): return 0
+    # Python 2 compatibility:
+    __nonzero__ = __bool__
     def __str__(self): return '[%s]'%self.__description
     def __repr__(self): return '<MissingValue 0x%x "%s">'%(id(self),
         self.__description)

test/mocknull.py

@@ -16,7 +16,9 @@ def __getattr__(self, name):
         return getattr(self, name)
 
     def __getitem__(self, key): return self
-    def __nonzero__(self): return 0
+    def __bool__(self): return 0
+    # Python 2 compatibility:
+    __nonzero__ = __bool__
     def __str__(self): return ''
     def __repr__(self): return '<MockNull 0x%x>'%id(self)
     def gettext(self, str): return str