Changeset 52 for trunk

Timestamp:

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

Author:

steve

Message:

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

Location:

trunk

Files:

• airspeed.py (modified) (2 diffs)
• 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()
-        if namespace.has_key(macro_key):
+        if global_ns.has_key(macro_key):
             raise Exception("cannot redefine macro")
-        namespace[macro_key] = self
+        global_ns[macro_key] = self
 
     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()))