added correct boolean evaluation

generate.py

@@ -94,6 +94,20 @@ def cls_func(defline, code):
         "return '{}({})'.format(self.__class__.__name__, self.val)",
         ]))
 
+    cls_code.extend(cls_func("def __bool__(self):", [
+        "''' boolean test for python3 '''",
+        "if self.val:",
+        "    return True",
+        "return False",
+        ]))
+
+    cls_code.extend(cls_func("def __nonzero__(self):", [
+        "''' boolean test for python2 '''",
+        "if self.val:",
+        "    return True",
+        "return False",
+        ]))
+
     if info['numeric']:
         for mtype, basecode in MATH_CODE.items():
             for basename, op in MATH_FUNCTIONS:

mutable_primitives/bool.py

@@ -36,3 +36,15 @@ def __str__(self):
 
     def __repr__(self):
         return '{}({})'.format(self.__class__.__name__, self.val)
+
+    def __bool__(self):
+        ''' boolean test for python3 '''
+        if self.val:
+            return True
+        return False
+
+    def __nonzero__(self):
+        ''' boolean test for python2 '''
+        if self.val:
+            return True
+        return False

mutable_primitives/float.py

@@ -38,6 +38,18 @@ def __str__(self):
     def __repr__(self):
         return '{}({})'.format(self.__class__.__name__, self.val)
 
+    def __bool__(self):
+        ''' boolean test for python3 '''
+        if self.val:
+            return True
+        return False
+
+    def __nonzero__(self):
+        ''' boolean test for python2 '''
+        if self.val:
+            return True
+        return False
+
     def __add__(self, other):
         return self.val + other
 

mutable_primitives/int.py

@@ -38,6 +38,18 @@ def __str__(self):
     def __repr__(self):
         return '{}({})'.format(self.__class__.__name__, self.val)
 
+    def __bool__(self):
+        ''' boolean test for python3 '''
+        if self.val:
+            return True
+        return False
+
+    def __nonzero__(self):
+        ''' boolean test for python2 '''
+        if self.val:
+            return True
+        return False
+
     def __add__(self, other):
         return self.val + other
 

test_mutable_primitives.py

@@ -9,9 +9,10 @@
         )
 
 DEFAULTS = {
-        "int": [5, 7],
+        # Intentionally put zero-values last to ensure others are used for equality comparisons
+        "int": [5, 7, 0],
         "bool": [True, False],
-        "float": [3.431, 8.543],
+        "float": [3.431, 8.543, 0.0],
         }
 
 
@@ -32,6 +33,14 @@ def test_eq(self):
         assert DEFAULTS[self.name][0] == self.typ(DEFAULTS[self.name][0])
         assert DEFAULTS[self.name][0] != self.typ(DEFAULTS[self.name][1])
 
+    def test_truthiness(self):
+        # check boolean evaluation
+        for val in DEFAULTS[self.name]:
+            if val:
+                assert self.typ(val), "{} evaluates True, but {} evaluates False".format(val, self.typ(val))
+            else:
+                assert not self.typ(val), "{} evaluates False, but {} evaluates True".format(val, self.typ(val))
+
     def test_set_get(self):
         obj = self.typ(DEFAULTS[self.name][0])
         assert obj.val == DEFAULTS[self.name][0]