[Zope-Checkins] CVS: Zope/lib/python/ZODB - Mount.py:1.18

[Shane Hathaway]

Update of /cvs-repository/Zope/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv19146

Modified Files:
	Mount.py 
Log Message:
Store _v_mount_point_ as a single-item tuple to hide from acquisition.
Also, avoid storing wrappers.


=== Zope/lib/python/ZODB/Mount.py 1.17 => 1.18 ===
--- Zope/lib/python/ZODB/Mount.py:1.17	Wed Feb  5 11:49:02 2003
+++ Zope/lib/python/ZODB/Mount.py	Wed Feb  5 14:45:02 2003
@@ -17,6 +17,7 @@
 __version__='$Revision$'[11:-2]
 
 import thread, Persistence, Acquisition
+from Acquisition import aq_base
 import ExtensionClass, string, time, sys
 from POSException import MountedStorageError
 from zLOG import LOG, ERROR, INFO, WARNING
@@ -151,10 +152,10 @@
 
     def _getObjectFromConnection(self, conn):
         obj = self._getMountRoot(conn.root())
-        data = getattr(obj, 'aq_base', obj)
+        data = aq_base(obj)
         # Store the data object in a tuple to hide from acquisition.
         self._v_data = (data,)
-        data._v_mount_point_ = self
+        data._v_mount_point_ = (aq_base(self),)
         return data
 
     def _getOrOpenObject(self, parent):