Changeset 32

Timestamp:

02/09/04 09:00:11 (4 years ago)

Author:

steve

Message:

fixed bug in "$a.b" when no "b" attr in "a", and "a" not a dict

Files:

• trunk/airspeed.py (modified) (1 diff, 1 prop)
• trunk/airspeed_test.py (modified) (1 diff, 1 prop)

trunk/airspeed.py

@@ -313 +313 @@
-            except KeyError: result = None
-            except TypeError: result = None
+            except AttributeError: result = None
-        if result is None:
-            return None ## TODO: an explicit 'not found' exception?

trunk/airspeed_test.py

@@ -392 +392 @@
-        template = airspeed.Template(" $user.name ")
-        self.assertEquals(" $user.name ", template.merge({'user':self}))
+
+    def test_when_non_dictionary_object_does_not_contain_referenced_attribute_no_substitution_occurs(self):
+        class MyObject: pass
+        template = airspeed.Template(" $user.name ")
+        self.assertEquals(" $user.name ", template.merge({'user':MyObject()}))
+
-#
-# TODO: