[Checkins] SVN: grok/trunk/src/grok/components.py small refactoring

[Philipp von Weitershausen]

Log message for revision 71888:
  small refactoring
  

Changed:
  U   grok/trunk/src/grok/components.py

-=-
Modified: grok/trunk/src/grok/components.py
===================================================================
--- grok/trunk/src/grok/components.py	2007-01-10 18:18:23 UTC (rev 71887)
+++ grok/trunk/src/grok/components.py	2007-01-10 18:21:15 UTC (rev 71888)
@@ -203,7 +203,18 @@
     pass
 
 
-class PageTemplate(TrustedAppPT, pagetemplate.PageTemplate):
+class GrokPageTemplate(object):
+
+    def __repr__(self):
+        return '<%s template in %s>' % (self.__grok_name__,
+                                        self.__grok_location__)
+
+    def _annotateGrokInfo(self, name, location):
+        self.__grok_name__ = name
+        self.__grok_location__ = location
+
+
+class PageTemplate(GrokPageTemplate, TrustedAppPT, pagetemplate.PageTemplate):
     expand = 0
 
     def __init__(self, template):
@@ -219,17 +230,10 @@
         # PageTemplate cannot be subclassed
         self.__grok_module__ = util.caller_module()
 
-    def __repr__(self):
-        return '<%s template in %s>' % (self.__grok_name__,
-                                        self.__grok_location__)
 
-    def _annotateGrokInfo(self, name, location):
-        self.__grok_name__ = name
-        self.__grok_location__ = location
+class PageTemplateFile(GrokPageTemplate, TrustedAppPT,
+                       pagetemplatefile.PageTemplateFile):
 
-
-class PageTemplateFile(TrustedAppPT, pagetemplatefile.PageTemplateFile):
-
     def __init__(self, filename, _prefix=None):
         _prefix = self.get_path_from_prefix(_prefix)
         super(PageTemplateFile, self).__init__(filename, _prefix)
@@ -240,15 +244,7 @@
         # PageTemplateFile cannot be subclassed
         self.__grok_module__ = util.caller_module()
 
-    def __repr__(self):
-        return '<%s template in %s>' % (self.__grok_name__,
-                                        self.__grok_location__)
 
-    def _annotateGrokInfo(self, name, location):
-        self.__grok_name__ = name
-        self.__grok_location__ = location
-
-
 class DirectoryResource(directoryresource.DirectoryResource):
     # We subclass this, because we want to override the default factories for
     # the resources so that .pt and .html do not get created as page