[Zope3-checkins] CVS: Zope3/src/zope/app/publication - zopepublication.py:1.34.2.3

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	zopepublication.py 
Log Message:
Reimplemented the ContainedProxy to be a persistent proxy.

Had to make some changes to zodb to support persistent proxies.
I've termorarily broken conflict resolution.



=== Zope3/src/zope/app/publication/zopepublication.py 1.34.2.2 => 1.34.2.3 ===
--- Zope3/src/zope/app/publication/zopepublication.py:1.34.2.2	Fri Sep 12 15:15:32 2003
+++ Zope3/src/zope/app/publication/zopepublication.py	Wed Sep 17 09:00:50 2003
@@ -45,7 +45,7 @@
 # XXX Should this be imported here?
 from transaction import get_transaction
 
-from zope.app.container.contained import ContainedProxy
+from zope.app.location import LocationProxy
 
 class Cleanup(object):
     def __init__(self, f):
@@ -246,7 +246,7 @@
                         loc = getattr(loc, '__self__', loc)
                     loc = ProxyFactory(loc)
                 
-                exception = ContainedProxy(exc_info[1], loc)
+                exception = LocationProxy(exc_info[1], loc)
                 name = queryDefaultViewName(exception, request, context=object)
                 if name is not None:
                     view = queryView(exception, name, request, context=object)