[Zope-CVS] CVS: Products/AdaptableStorage/serial_ofs - FolderItems.py:1.14 FolderItemsByKeychain.py:1.5

[Shane Hathaway]

Update of /cvs-repository/Products/AdaptableStorage/serial_ofs
In directory cvs.zope.org:/tmp/cvs-serv18842

Modified Files:
	FolderItems.py FolderItemsByKeychain.py 
Log Message:
Modified to expect _v_mount_point_ to be a one-item tuple, to hide from
acquisition.


=== Products/AdaptableStorage/serial_ofs/FolderItems.py 1.13 => 1.14 ===
--- Products/AdaptableStorage/serial_ofs/FolderItems.py:1.13	Wed Feb  5 11:53:22 2003
+++ Products/AdaptableStorage/serial_ofs/FolderItems.py	Wed Feb  5 14:43:12 2003
@@ -46,10 +46,10 @@
         state = []
         event.ignoreAttribute('_objects')
         for id, subob in object.objectItems():
-            mp = subob.__dict__.get('_v_mount_point_')
+            mp = getattr(subob, '_v_mount_point_', None)
             if mp is not None:
                 # Store the mount point rather than the mounted object.
-                subob = mp
+                subob = mp[0]
             base = aq_base(subob)
             keychain = event.identifyObject(base)
             expected = event.makeKeychain(id, 0)


=== Products/AdaptableStorage/serial_ofs/FolderItemsByKeychain.py 1.4 => 1.5 ===
--- Products/AdaptableStorage/serial_ofs/FolderItemsByKeychain.py:1.4	Wed Feb  5 11:53:22 2003
+++ Products/AdaptableStorage/serial_ofs/FolderItemsByKeychain.py	Wed Feb  5 14:43:12 2003
@@ -45,10 +45,10 @@
         state = []
         event.ignoreAttribute('_objects')
         for id, subob in object.objectItems():
-            mp = subob.__dict__.get('_v_mount_point_')
+            mp = getattr(subob, '_v_mount_point_', None)
             if mp is not None:
                 # Store the mount point rather than the mounted object.
-                subob = mp
+                subob = mp[0]
             base = aq_base(subob)
             keychain = event.identifyObject(base)
             if keychain is None: