[Zope3-checkins] CVS: Zope3/src/zope/app/browser/form - editview.py:1.37.4.1 editwizard.py:1.14.6.1 schemadisplay.py:1.10.8.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/browser/form
In directory cvs.zope.org:/tmp/cvs-serv20092/src/zope/app/browser/form

Modified Files:
      Tag: parentgeddon-branch
	editview.py editwizard.py schemadisplay.py 
Log Message:
Checking in work in progress on parentgeddon-branch so Fred can help
me to get the tests passing.  Specific log entries will be provided
when we merge this into the head.


=== Zope3/src/zope/app/browser/form/editview.py 1.37 => 1.37.4.1 ===
--- Zope3/src/zope/app/browser/form/editview.py:1.37	Thu Aug 28 18:40:25 2003
+++ Zope3/src/zope/app/browser/form/editview.py	Mon Sep  8 14:21:26 2003
@@ -19,12 +19,11 @@
 
 from zope.schema import getFieldNamesInOrder
 from zope.publisher.interfaces.browser import IBrowserPresentation
-from zope.publisher.browser import BrowserView
+from zope.app.publisher.browser import BrowserView
 from zope.security.checker import defineChecker, NamesChecker
 from zope.component.view import provideView
 from zope.component import getAdapter
 
-from zope.app.context import ContextWrapper
 from zope.app.i18n import ZopeMessageIDFactory as _
 from zope.app.interfaces.form import WidgetsError
 from zope.app.form.utility import setUpEditWidgets, applyWidgetsChanges
@@ -57,7 +56,7 @@
     def _setUpWidgets(self):
         adapted = getAdapter(self.context, self.schema)
         if adapted is not self.context:
-            adapted = ContextWrapper(adapted, self.context, name='(adapted)')
+            adapted.__parent__ = self.context
         self.adapted = adapted
         setUpEditWidgets(self, self.schema, names=self.fieldNames,
                          content=self.adapted)


=== Zope3/src/zope/app/browser/form/editwizard.py 1.14 => 1.14.6.1 ===
--- Zope3/src/zope/app/browser/form/editwizard.py:1.14	Wed Aug 13 17:27:50 2003
+++ Zope3/src/zope/app/browser/form/editwizard.py	Mon Sep  8 14:21:26 2003
@@ -23,7 +23,6 @@
 from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.security.checker import defineChecker, NamesChecker
-from zope.app.context import ContextWrapper
 from zope.component.view import provideView
 from zope.app.form.utility \
         import setUpEditWidgets, getWidgetsData, applyWidgetsChanges
@@ -60,7 +59,7 @@
     def _setUpWidgets(self):
         adapted = getAdapter(self.context, self.schema)
         if adapted is not self.context:
-            adapted = ContextWrapper(adapted, self.context, name='(adapted)')
+            adapted.__parent__ = self.context
         self.adapted = adapted
 
         if self.use_session:


=== Zope3/src/zope/app/browser/form/schemadisplay.py 1.10 => 1.10.8.1 ===
--- Zope3/src/zope/app/browser/form/schemadisplay.py:1.10	Thu Aug  7 13:40:28 2003
+++ Zope3/src/zope/app/browser/form/schemadisplay.py	Mon Sep  8 14:21:26 2003
@@ -17,9 +17,8 @@
 """
 from zope.schema import getFieldNamesInOrder
 
-from zope.app.context import ContextWrapper
 from zope.publisher.interfaces.browser import IBrowserPresentation
-from zope.publisher.browser import BrowserView
+from zope.app.publisher.browser import BrowserView
 from zope.security.checker import defineChecker, NamesChecker
 from zope.component.view import provideView
 from zope.component import getAdapter
@@ -49,7 +48,7 @@
     def _setUpWidgets(self):
         adapted = getAdapter(self.context, self.schema)
         if adapted is not self.context:
-            adapted = ContextWrapper(adapted, self.context, name='(adapted)')
+            adapted.__parent__ = self.context
         self.adapted = adapted
         setUpDisplayWidgets(self, self.schema, names=self.fieldNames,
                             content=adapted)