[Checkins] SVN: Sandbox/malthe/chameleon.zpt/src/chameleon/zpt/loader.py Various fixes

[Wichert Akkerman]

Log message for revision 91520:
  Various fixes

Changed:
  U   Sandbox/malthe/chameleon.zpt/src/chameleon/zpt/loader.py

-=-
Modified: Sandbox/malthe/chameleon.zpt/src/chameleon/zpt/loader.py
===================================================================
--- Sandbox/malthe/chameleon.zpt/src/chameleon/zpt/loader.py	2008-09-26 13:35:32 UTC (rev 91519)
+++ Sandbox/malthe/chameleon.zpt/src/chameleon/zpt/loader.py	2008-09-26 13:43:52 UTC (rev 91520)
@@ -1,12 +1,13 @@
 from chameleon.core.loader import TemplateLoader as BaseLoader
-from chameleon.core.zpt import language
-from chameleon.core.zpt import template
+from chameleon.zpt import language
+from chameleon.zpt import template
 
+
 class TemplateLoader(BaseLoader):
     default_parser = language.Parser()
 
     def load(self, filename):
-        return super(BaseLoader, self).load(filename,
-                klass=template.PageTemplateFile)
+        return super(TemplateLoader, self).load(filename,
+                template.PageTemplateFile)