Changeset 49

Timestamp:

22/09/05 09:40:35 (3 years ago)

Author:

steve

Message:

Ensure that None is interpreted as False in conditionals and binary logical expressions

Files:

• trunk/airspeed.py (modified) (3 diffs)
• trunk/airspeed_test.py (modified) (4 diffs)

trunk/airspeed.py

@@ -27 +27 @@
-    operator.__eq__ = lambda a, b: a == b
-    operator.__ne__ = lambda a, b: a != b
-    operator.__or__ = lambda a, b: a or b
-    operator.__and__ = lambda a, b: a and b
-try:
-    basestring
@@ -38 +36 @@
-# Public interface
-###############################################################################
+
+def boolean_value(variable_value):
+    if variable_value == False: return False
+    return not (variable_value is None)
+
-
-class Template:
@@ -443 +446 @@
-                 '<' : operator.__lt__, '<=': operator.__le__,
-                 '==': operator.__eq__, '!=': operator.__ne__,
-
+
+
-    def parse(self):
-        op_string, = self.identity_match(self.BINARY_OP)

trunk/airspeed_test.py

@@ -86 +86 @@
-        namespace["is_birthday"] = True
-        self.assertEquals("Hello your name is Steve. Happy Birthday. Good to see you", template.merge(namespace))
+
+    def test_if_statement_considers_None_to_be_false(self):
+        template = airspeed.Template("#if ($some_value)hide me#end")
+        self.assertEquals('', template.merge({}))
+        self.assertEquals('', template.merge({'some_value': None}))
-
-    def test_new_lines_in_templates_are_permitted(self):
@@ -314 +319 @@
-        self.assertEquals('yes', template.merge({'value1': False, 'value2': True}))
-
+    def test_or_operator_considers_not_None_values_true(self):
+        class SomeClass: pass
+        template = airspeed.Template('#if ( $value1 || $value2 )yes#end')
+        self.assertEquals('', template.merge({'value1': None, 'value2': None}))
+        self.assertEquals('yes', template.merge({'value1': SomeClass(), 'value2': False}))
+        self.assertEquals('yes', template.merge({'value1': False, 'value2': SomeClass()}))
+
-    def test_and_operator(self):
-        template = airspeed.Template('#if ( $value1 && $value2 )yes#end')
@@ -321 +333 @@
-        self.assertEquals('yes', template.merge({'value1': True, 'value2': True}))
-
+    def test_and_operator_considers_not_None_values_true(self):
+        class SomeClass: pass
+        template = airspeed.Template('#if ( $value1 && $value2 )yes#end')
+        self.assertEquals('', template.merge({'value1': None, 'value2': None}))
+        self.assertEquals('yes', template.merge({'value1': SomeClass(), 'value2': True}))
+        self.assertEquals('yes', template.merge({'value1': True, 'value2': SomeClass()}))
+
-    def test_parenthesised_value(self):
-        template = airspeed.Template('#if ( ($value1 == 1) && ($value2 == 2) )yes#end')
@@ -337 +356 @@
-        self.assertEquals('yes', template.merge({'value': False}))
-        self.assertEquals('', template.merge({'value': True}))
+
+    def test_logical_negation_operator_yields_true_for_None(self):
+        template = airspeed.Template('#if ( !$value )yes#end')
+        self.assertEquals('yes', template.merge({'value': None}))
-
-    def test_compound_binary_and_unary_operators(self):