[Checkins] SVN: z3c.pt/trunk/ Relative paths are now allowed across the board, not only for view page template classes.

[Malthe Borch]

Log message for revision 84412:
  Relative paths are now allowed across the board, not only for view page template classes.

Changed:
  U   z3c.pt/trunk/setup.py
  U   z3c.pt/trunk/z3c/pt/pagetemplate.py
  U   z3c.pt/trunk/z3c/pt/template.py
  U   z3c.pt/trunk/z3c/pt/texttemplate.py

-=-
Modified: z3c.pt/trunk/setup.py
===================================================================
--- z3c.pt/trunk/setup.py	2008-03-02 18:03:51 UTC (rev 84411)
+++ z3c.pt/trunk/setup.py	2008-03-02 18:14:48 UTC (rev 84412)
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.6'
+version = '0.6.1'
 
 setup(name='z3c.pt',
       version=version,

Modified: z3c.pt/trunk/z3c/pt/pagetemplate.py
===================================================================
--- z3c.pt/trunk/z3c/pt/pagetemplate.py	2008-03-02 18:03:51 UTC (rev 84411)
+++ z3c.pt/trunk/z3c/pt/pagetemplate.py	2008-03-02 18:14:48 UTC (rev 84412)
@@ -14,12 +14,20 @@
     def translate(self):
         return translation.translate_xml
 
-class ViewPageTemplate(template.BaseViewTemplate):
+class ViewPageTemplate(property):
     def __init__(self, body):
-        super(ViewPageTemplate, self).__init__(body)
         self.template = PageTemplate(body)
+        property.__init__(self, self.render)
+
+    def render(self, view):
+        def template(**kwargs):
+            return self.template.render(view=view,
+                                        context=view.context,
+                                        request=view.request,
+                                        options=kwargs)
+        return template        
     
-class ViewPageTemplateFile(template.BaseViewTemplateFile):
+class ViewPageTemplateFile(ViewPageTemplate):
     def __init__(self, filename):
-        super(ViewPageTemplateFile, self).__init__(filename)
-        self.template = PageTemplateFile(self.filename)
+        self.template = PageTemplateFile(filename)
+        property.__init__(self, self.render)

Modified: z3c.pt/trunk/z3c/pt/template.py
===================================================================
--- z3c.pt/trunk/z3c/pt/template.py	2008-03-02 18:03:51 UTC (rev 84411)
+++ z3c.pt/trunk/z3c/pt/template.py	2008-03-02 18:14:48 UTC (rev 84412)
@@ -40,8 +40,21 @@
 
 class BaseTemplateFile(BaseTemplate):
     def __init__(self, filename):
+        if not os.path.isabs(filename):
+            package_name = sys._getframe(2).f_globals['__name__']
+            module = sys.modules[package_name]
+            try:
+                path = module.__path__[0]
+            except AttributeError:
+                path = module.__file__
+                path = path[:path.rfind(os.sep)]
+                
+            filename = path + os.sep + filename
+
+        # make sure file exists
+        os.lstat(filename)
         self.filename = filename
-        
+                
     def _get_filename(self):
         return getattr(self, '_filename', None)
 
@@ -73,34 +86,3 @@
             return os.path.getmtime(self.filename)
         except OSError:
             return 0
-
-class BaseViewTemplate(property):
-    def __init__(self, body):
-        property.__init__(self, self.render)
-
-    def render(self, view):
-        def template(**kwargs):
-            return self.template.render(view=view,
-                                        context=view.context,
-                                        request=view.request,
-                                        options=kwargs)
-        return template
-
-class BaseViewTemplateFile(BaseViewTemplate):
-    def __init__(self, filename):
-        if not os.path.isabs(filename):
-            package_name = sys._getframe(2).f_globals['__name__']
-            module = sys.modules[package_name]
-            try:
-                path = module.__path__[0]
-            except AttributeError:
-                path = module.__file__
-                path = path[:path.rfind(os.sep)]
-                
-            filename = path + os.sep + filename
-
-        # make sure file exists
-        os.lstat(filename)
-        self.filename = filename
-        
-        property.__init__(self, self.render)

Modified: z3c.pt/trunk/z3c/pt/texttemplate.py
===================================================================
--- z3c.pt/trunk/z3c/pt/texttemplate.py	2008-03-02 18:03:51 UTC (rev 84411)
+++ z3c.pt/trunk/z3c/pt/texttemplate.py	2008-03-02 18:14:48 UTC (rev 84412)
@@ -11,12 +11,20 @@
     def translate(self):
         return translation.translate_text
 
-class ViewTextTemplate(template.BaseViewTemplate):
+class ViewTextTemplate(property):
     def __init__(self, body):
-        super(ViewTextTemplate, self).__init__(body)
         self.template = TextTemplate(body)
+        property.__init__(self, self.render)
+
+    def render(self, view):
+        def template(**kwargs):
+            return self.template.render(view=view,
+                                        context=view.context,
+                                        request=view.request,
+                                        options=kwargs)
+        return template        
     
-class ViewTextTemplateFile(template.BaseViewTemplateFile):
+class ViewTextTemplateFile(ViewTextTemplate):
     def __init__(self, filename):
-        super(ViewTextTemplateFile, self).__init__(filename)
-        self.template = TextTemplateFile(self.filename)
+        self.template = TextTemplateFile(filename)
+        property.__init__(self, self.render)