[Zope-CVS] CVS: Products/Ape/lib/apelib/zope2/setup - patches.py:1.2 TmpStore.py:NONE

[Shane Hathaway]

Update of /cvs-repository/Products/Ape/lib/apelib/zope2/setup
In directory cvs.zope.org:/tmp/cvs-serv30293/lib/apelib/zope2/setup

Modified Files:
	patches.py 
Removed Files:
	TmpStore.py 
Log Message:
Merged ape-fs-oid-branch.

Ape now uses arbitrary OIDs on the filesystem, rather than using paths 
as OIDs.  This solves problems with moving and replacing objects and 
further unifies SQL and filesystem databases.



=== Products/Ape/lib/apelib/zope2/setup/patches.py 1.1 => 1.2 ===
--- Products/Ape/lib/apelib/zope2/setup/patches.py:1.1	Wed Apr  9 23:09:59 2003
+++ Products/Ape/lib/apelib/zope2/setup/patches.py	Sat Feb 28 15:06:29 2004
@@ -35,30 +35,5 @@
     CopySource._getCopy = _getCopy
 
 
-def applySetObPatch():
-    # Fall back to copying when move/rename is not possible.
-    def _setOb(self, id, object):
-        if object._p_oid is not None:
-            if (getattr(self, '_use_fixed_oids_', 0)
-                or (object._p_jar is not None
-                    and object._p_jar is not self._p_jar)):
-                old = object
-                # Forget changes to the original object
-                old._p_changed = 0
-                object = copyOf(object)
-        setattr(self, id, object)
-
-    from OFS.ObjectManager import ObjectManager
-    ObjectManager._setOb = _setOb
-
-
-def applyTmpStorePatch():
-    from TmpStore import TmpStore as patched_TmpStore
-    import ZODB.TmpStore
-    ZODB.TmpStore.TmpStore = patched_TmpStore
-
 def applyPatches():
     applyCopySupportPatch()
-    applySetObPatch()
-    applyTmpStorePatch()
-

=== Removed File Products/Ape/lib/apelib/zope2/setup/TmpStore.py ===