[Zope3-checkins] CVS: Zope3/src/zope/app/pagetemplate - engine.py:1.21 viewpagetemplatefile.py:1.10

[Jim Fulton]

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

Modified Files:
	engine.py viewpagetemplatefile.py 
Log Message:
Removed dependencies on zope.context


=== Zope3/src/zope/app/pagetemplate/engine.py 1.20 => 1.21 ===
--- Zope3/src/zope/app/pagetemplate/engine.py:1.20	Wed Jan 14 08:40:18 2004
+++ Zope3/src/zope/app/pagetemplate/engine.py	Tue Feb 10 20:14:02 2004
@@ -30,7 +30,6 @@
 from zope.tales.tales import ExpressionEngine
 from zope.tales.tales import Context
 
-from zope.context.wrapper import getbaseobject
 from zope.proxy import removeAllProxies
 from zope.security.proxy import ProxyFactory
 from zope.security.builtins import RestrictedBuiltins
@@ -76,7 +75,7 @@
             return text
         if isinstance(text, StringTypes):
             # text could be a proxied/wrapped object
-            return getbaseobject(text)
+            return text
         return unicode(text)
 
     def evaluateMacro(self, expr):


=== Zope3/src/zope/app/pagetemplate/viewpagetemplatefile.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/pagetemplate/viewpagetemplatefile.py:1.9	Sun Dec  7 05:04:52 2003
+++ Zope3/src/zope/app/pagetemplate/viewpagetemplatefile.py	Tue Feb 10 20:14:02 2004
@@ -21,9 +21,8 @@
 from zope.pagetemplate.pagetemplatefile import PageTemplateFile
 from zope.component import getView
 from zope.app.pagetemplate.engine import AppPT
-from zope.context import ContextDescriptor
 
-class ViewPageTemplateFile(AppPT, PageTemplateFile, ContextDescriptor):
+class ViewPageTemplateFile(AppPT, PageTemplateFile):
     """Page Templates used as methods of views defined as Python classes.
     """