Changeset 52

Timestamp:

01/02/06 16:18:02 (2 years ago)

Author:

steve

Message:

Allow #macro in #parse'd files (fixes #9)

Files:

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

trunk/airspeed.py

@@ -143 +143 @@
-            return parent_value
-
+    def top(self):
+        if hasattr(self.parent, "top"):
+            return self.parent.top()
+        return self.parent
+
-    def __repr__(self):
-        return dict.__repr__(self) + '->' + repr(self.parent)
@@ -581 +586 @@
-
-    def evaluate(self, stream, namespace, loader):
+        global_ns = namespace.top()
-        macro_key = '#' + self.macro_name.lower()
-namespace
+global_ns
-            raise Exception("cannot redefine macro")
-namespace
+global_ns
-
-    def execute_macro(self, stream, namespace, arg_value_elements, loader):

trunk/airspeed_test.py

@@ -522 +522 @@
-        value = unicode('Grüße', 'latin1')
-        self.assertEquals(value, template.merge(locals()))
+
+    def test_can_define_macros_in_parsed_files(self):
+        class Loader:
+            def load_template(self, name):
+                if name == 'foo.tmpl':
+                    return airspeed.Template('#macro(themacro)works#end')
+        template = airspeed.Template('#parse("foo.tmpl")#themacro()')
+        self.assertEquals('works', template.merge({}, loader=Loader()))
-
-