[Checkins] SVN: megrok.genshi/trunk/src/megrok/genshi/components.py Simplification after the docs where written.

[Lennart Regebro]

Log message for revision 80671:
  Simplification after the docs where written.
  

Changed:
  U   megrok.genshi/trunk/src/megrok/genshi/components.py

-=-
Modified: megrok.genshi/trunk/src/megrok/genshi/components.py
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/components.py	2007-10-05 21:34:44 UTC (rev 80670)
+++ megrok.genshi/trunk/src/megrok/genshi/components.py	2007-10-05 21:35:33 UTC (rev 80671)
@@ -21,20 +21,17 @@
 
 class GenshiTemplateBase(grok.components.GrokPageTemplate):
 
-    def __call__(self, namespace):
-        stream = self._template.generate(**namespace)
-        return stream.render(self.result_type)
-
     def _factory_init(self, factory):
         pass
     
-    def getDefaultVariables(self):
+    def default_namespace(self):
         return {}
     
     def render_template(self, view):
-        namespace = view.getDefaultVariables()
-        namespace.update(view.getTemplateVariables())
-        return self(namespace)
+        namespace = view.default_namespace()
+        namespace.update(view.extra_namespace())
+        stream = self._template.generate(**namespace)
+        return stream.render(self.result_type)
 
 
 class GenshiMarkupTemplate(GenshiTemplateBase):