Commit 14dd090d authored by Shane Hathaway's avatar Shane Hathaway

Store _v_mount_point_ as a single-item tuple to hide from acquisition.

Also, avoid storing wrappers.
parent a88a6aa0
...@@ -13,10 +13,11 @@ ...@@ -13,10 +13,11 @@
############################################################################## ##############################################################################
"""Mounted database support """Mounted database support
$Id: Mount.py,v 1.17 2003/02/05 16:49:02 shane Exp $""" $Id: Mount.py,v 1.18 2003/02/05 19:45:02 shane Exp $"""
__version__='$Revision: 1.17 $'[11:-2] __version__='$Revision: 1.18 $'[11:-2]
import thread, Persistence, Acquisition import thread, Persistence, Acquisition
from Acquisition import aq_base
import ExtensionClass, string, time, sys import ExtensionClass, string, time, sys
from POSException import MountedStorageError from POSException import MountedStorageError
from zLOG import LOG, ERROR, INFO, WARNING from zLOG import LOG, ERROR, INFO, WARNING
...@@ -151,10 +152,10 @@ class MountPoint(Persistence.Persistent, Acquisition.Implicit): ...@@ -151,10 +152,10 @@ class MountPoint(Persistence.Persistent, Acquisition.Implicit):
def _getObjectFromConnection(self, conn): def _getObjectFromConnection(self, conn):
obj = self._getMountRoot(conn.root()) 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. # Store the data object in a tuple to hide from acquisition.
self._v_data = (data,) self._v_data = (data,)
data._v_mount_point_ = self data._v_mount_point_ = (aq_base(self),)
return data return data
def _getOrOpenObject(self, parent): def _getOrOpenObject(self, parent):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment