Changeset 16:2e6cee916f99

Timestamp:

09/02/08 19:39:32 (4 months ago)

Author:

Richard Davies <richard.davies@…>

Branch:

default

Message:

Update for Genshi 0.5.1

Files:

• ghrml/template.py (modified) (1 diff)
• test.py (modified) (1 diff)

ghrml/template.py

@@ -30 +30 @@
     }
 
-    # Works in Genshi 0.4.4
-    # For Genshi Subversion 21/05/2008, need to change argument list to
-    # def __init__(self, source, filepath=None, filename=None, loader=None,
-    #              encoding=None, lookup='strict', allow_exec=True,
-    #              default_namespace=None):
-    # and pass this version on through
-    def __init__(self, source, basedir=None, filename=None, loader=None,
-                 encoding=None, lookup='lenient',
-                 default_namespace=None):
+    def __init__(self, source, default_namespace=None, **kwargs):
         if default_namespace is None:
             default_namespace = self.DEFAULT_NAMESPACE
         self.default_namespace = default_namespace
-        MarkupTemplate.__init__(self, source, basedir=basedir,
-                                filename=filename, loader=loader,
-                                encoding=encoding, lookup=lookup)
+        MarkupTemplate.__init__(self, source, **kwargs)
 
     def _parse(self, source, encoding):

test.py

@@ -4 +4 @@
 print GHRMLTemplate("""
 
+- foo = 42
+
 %html
   [def bar()] 42
 
   %head
-    %title $title
+    %title $title - $foo
 
   %body