Changeset 41

Timestamp:

17/02/05 01:54:43 (3 years ago)

Author:

steve

Message:

Fixed #3: Should quietly do nothing when #foreach-ing over a None value

Files:

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

trunk/airspeed.py

@@ -656 +656 @@
-        counter = 1
-        try:
+            if iterable is None:
+                return
-            if hasattr(iterable, 'keys'): iterable = iterable.keys()
-            if not hasattr(iterable, '__getitem__'):

trunk/airspeed_test.py

@@ -421 +421 @@
-        template = airspeed.Template(text)
-        self.assertEquals(text, template.merge({}))
+
+    def test_foreach_with_unset_variable_expands_to_nothing(self):
+        template = airspeed.Template('#foreach($value in $values)foo#end')
+        self.assertEquals('', template.merge({}))
-
-#