[Checkins] SVN: grok/branches/regebro-guido-templates/src/grok/ Renamed the BasePageTemplate and GrokPageTemplate to BaseTemplate and

[Lennart Regebro]

Log message for revision 81434:
  Renamed the BasePageTemplate and GrokPageTemplate to BaseTemplate and 
  GrokTemplate, to make sure they are *not* Zope Page Templates.
  

Changed:
  U   grok/branches/regebro-guido-templates/src/grok/components.py
  U   grok/branches/regebro-guido-templates/src/grok/meta.py
  U   grok/branches/regebro-guido-templates/src/grok/tests/template/pluggability.py

-=-
Modified: grok/branches/regebro-guido-templates/src/grok/components.py
===================================================================
--- grok/branches/regebro-guido-templates/src/grok/components.py	2007-11-03 16:32:16 UTC (rev 81433)
+++ grok/branches/regebro-guido-templates/src/grok/components.py	2007-11-03 16:34:06 UTC (rev 81434)
@@ -191,7 +191,7 @@
         return simplejson.dumps(method_result)
 
 
-class BasePageTemplate(object):
+class BaseTemplate(object):
     """Any sort of page template"""
     
     interface.implements(interfaces.ITemplate)
@@ -211,7 +211,7 @@
         pass
 
 
-class GrokPageTemplate(BasePageTemplate):
+class GrokTemplate(BaseTemplate):
     """A slightly more advanced page template
     
     This provides most of what a page template needs and is a good base for
@@ -222,7 +222,7 @@
         # __grok_module__ is needed to make defined_locally() return True for
         # inline templates
         # XXX unfortunately using caller_module means that care must be taken
-        # when GrokPageTemplate is subclassed.
+        # when GrokTemplate is subclassed.
         self.__grok_module__ = martian.util.caller_module()
         
         if not (template is None) ^ (filename is None):
@@ -266,7 +266,7 @@
         return self._template
 
 
-class PageTemplate(BasePageTemplate, TrustedAppPT, pagetemplate.PageTemplate):
+class PageTemplate(BaseTemplate, TrustedAppPT, pagetemplate.PageTemplate):
     expand = 0
 
     def __init__(self, template):
@@ -302,7 +302,7 @@
         return self.pt_render(namespace)
 
 
-class PageTemplateFile(BasePageTemplate, TrustedAppPT,
+class PageTemplateFile(BaseTemplate, TrustedAppPT,
                        pagetemplatefile.PageTemplateFile):
     
     def __init__(self, filename, _prefix=None):

Modified: grok/branches/regebro-guido-templates/src/grok/meta.py
===================================================================
--- grok/branches/regebro-guido-templates/src/grok/meta.py	2007-11-03 16:32:16 UTC (rev 81433)
+++ grok/branches/regebro-guido-templates/src/grok/meta.py	2007-11-03 16:34:06 UTC (rev 81434)
@@ -261,7 +261,7 @@
     # use the templates
     priority = 1000
 
-    component_class = grok.components.BasePageTemplate
+    component_class = grok.components.BaseTemplate
 
     def grok(self, name, instance, context, module_info, templates):
         templates.register(name, instance)

Modified: grok/branches/regebro-guido-templates/src/grok/tests/template/pluggability.py
===================================================================
--- grok/branches/regebro-guido-templates/src/grok/tests/template/pluggability.py	2007-11-03 16:32:16 UTC (rev 81433)
+++ grok/branches/regebro-guido-templates/src/grok/tests/template/pluggability.py	2007-11-03 16:34:06 UTC (rev 81434)
@@ -41,7 +41,7 @@
         # Silliest template language ever:
         return self._text % kw
 
-class MyPageTemplate(grok.components.GrokPageTemplate):
+class MyPageTemplate(grok.components.GrokTemplate):
 
     def fromTemplate(self, template):
         return MyTemplate(template)