[Checkins] SVN: Sandbox/malthe/chameleon.genshi/ Simplify TemplateLoader

[Wichert Akkerman]

Log message for revision 91519:
  Simplify TemplateLoader

Changed:
  U   Sandbox/malthe/chameleon.genshi/CHANGES.txt
  U   Sandbox/malthe/chameleon.genshi/setup.py
  U   Sandbox/malthe/chameleon.genshi/src/chameleon/genshi/loader.py

-=-
Modified: Sandbox/malthe/chameleon.genshi/CHANGES.txt
===================================================================
--- Sandbox/malthe/chameleon.genshi/CHANGES.txt	2008-09-26 13:32:42 UTC (rev 91518)
+++ Sandbox/malthe/chameleon.genshi/CHANGES.txt	2008-09-26 13:35:32 UTC (rev 91519)
@@ -4,6 +4,10 @@
 Head
 ~~~~
 
+- Add a specialized TemplateLoader. [wichert]
+
+
+
 1.0a1 (released 9/24/2008)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 

Modified: Sandbox/malthe/chameleon.genshi/setup.py
===================================================================
--- Sandbox/malthe/chameleon.genshi/setup.py	2008-09-26 13:32:42 UTC (rev 91518)
+++ Sandbox/malthe/chameleon.genshi/setup.py	2008-09-26 13:35:32 UTC (rev 91519)
@@ -8,7 +8,7 @@
     'zope.interface',
     'zope.component',
     'zope.i18n >= 3.5',
-    'chameleon.core',
+    'chameleon.core >=1.0a3dev',
     ]
 
 setup(name='chameleon.genshi',

Modified: Sandbox/malthe/chameleon.genshi/src/chameleon/genshi/loader.py
===================================================================
--- Sandbox/malthe/chameleon.genshi/src/chameleon/genshi/loader.py	2008-09-26 13:32:42 UTC (rev 91518)
+++ Sandbox/malthe/chameleon.genshi/src/chameleon/genshi/loader.py	2008-09-26 13:35:32 UTC (rev 91519)
@@ -1,10 +1,12 @@
 from chameleon.core.loader import TemplateLoader as BaseLoader
 from chameleon.core.genshi import language
+from chameleon.core.genshi import template
 
+
 class TemplateLoader(BaseLoader):
-    def __init__(self, *args, **kwargs):
-        if "parser" not in kwargs:
-            kwargs["parser"] = language.Parser()
+    default_parser = language.Parser()
 
-        super(BaseLoader, self).__init__(*args, **kwargs)
+    def load(self, filename):
+        return super(BaseLoader, self).load(filename,
+                klass=template.GenshiTemplateFile)