[Zope3-checkins] CVS: Zope3/src/zope/app/content - dtmlpage.py:1.7

[Jim Fulton]

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

Modified Files:
	dtmlpage.py 
Log Message:
No-longer use context wrappers.


=== Zope3/src/zope/app/content/dtmlpage.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/content/dtmlpage.py:1.6	Sat Jun  7 02:37:23 2003
+++ Zope3/src/zope/app/content/dtmlpage.py	Sun Sep 21 13:31:49 2003
@@ -22,13 +22,12 @@
 from zope.app.interfaces.file import IFileFactory
 from zope.interface import implements
 
-from zope.context import ContextMethod
-from zope.context import getWrapperContainer
 from zope.security.proxy import ProxyFactory
 
 from zope.documenttemplate.dt_html import HTML
+from zope.app.container.contained import Contained
 
-class DTMLPage(Persistent):
+class DTMLPage(Persistent, Contained):
 
     # XXX Putting IFileContent at the end gives an error!
     implements(IFileContent, IDTMLPage, IRenderDTMLPage, IAnnotatable)
@@ -48,7 +47,7 @@
     def render(self, request, *args, **kw):
         """See interface IDTMLRenderPage"""
 
-        instance = ProxyFactory(getWrapperContainer(self))
+        instance = ProxyFactory(self.__parent__)
         request = ProxyFactory(request)
 
         for k in kw:
@@ -57,8 +56,6 @@
 
         return self.template(instance, request, **kw)
 
-
-    render = ContextMethod(render)
 
     __call__ = render