[Zope3-checkins] CVS: Zope3/src/zope/pagetemplate - pagetemplatefile.py:1.2.8.1

[Godefroid Chapelle]

Update of /cvs-repository/Zope3/src/zope/pagetemplate
In directory cvs.zope.org:/tmp/cvs-serv25586

Modified Files:
      Tag: template_usage-branch
	pagetemplatefile.py 
Log Message:
Construction of ViewPageTemplateFile with relative template filename only
was broken.
Fix



=== Zope3/src/zope/pagetemplate/pagetemplatefile.py 1.2 => 1.2.8.1 ===
--- Zope3/src/zope/pagetemplate/pagetemplatefile.py:1.2	Wed Dec 25 09:15:13 2002
+++ Zope3/src/zope/pagetemplate/pagetemplatefile.py	Tue Feb 25 18:22:09 2003
@@ -35,12 +35,17 @@
     _v_last_read = 0
 
     def __init__(self, filename, _prefix=None):
-        if not isinstance(_prefix, str):
-            if _prefix is None:
-                _prefix = sys._getframe(1).f_globals
-            _prefix = package_home(_prefix)
+        path = self.get_path_from_prefix(_prefix)
+        self.filename = os.path.join(path, filename)
 
-        self.filename = os.path.join(_prefix, filename)
+    def get_path_from_prefix(self, _prefix):
+        if isinstance(_prefix, str):
+            path = _prefix
+        else:
+            if _prefix is None:
+                _prefix = sys._getframe(2).f_globals
+            path = package_home(_prefix)
+        return path
 
     def _cook_check(self):
         if self._v_last_read and not __debug__: