[Zope3-checkins] CVS: Zope3/src/zodb/code - class_.py:1.21.4.1 module.py:1.18.4.1 patch.py:1.14.4.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zodb/code
In directory cvs.zope.org:/tmp/cvs-serv25080/src/zodb/code

Modified Files:
      Tag: zope3-zodb3-devel-branch
	class_.py module.py patch.py 
Log Message:
Checkpointing to the branch after beginning the process of removing
zodb 4 code. 

Lots of things are now broken. :)




=== Zope3/src/zodb/code/class_.py 1.21 => 1.21.4.1 ===
--- Zope3/src/zodb/code/class_.py:1.21	Wed Oct 29 14:32:50 2003
+++ Zope3/src/zodb/code/class_.py	Fri Jan  9 17:23:30 2004
@@ -16,8 +16,7 @@
 __metaclass__ = type
 
 from zope.interface import implements
-from persistence import PersistentMetaClass
-from persistence._persistence import UPTODATE, CHANGED, GHOST
+from persistent.cPersistence import UPTODATE, CHANGED, GHOST
 from persistence.interfaces import IPersistent
 from zodb.code.function import PersistentFunction
 
@@ -214,7 +213,7 @@
     # A data descriptor for _p_changed.
     pass
 
-class PersistentClassMetaClass(PersistentMetaClass):
+class PersistentClassMetaClass(type):
 
     # An attempt to make persistent classes look just like other
     # persistent objects by providing class attributes and methods


=== Zope3/src/zodb/code/module.py 1.18 => 1.18.4.1 ===
--- Zope3/src/zodb/code/module.py:1.18	Mon Nov 10 13:49:56 2003
+++ Zope3/src/zodb/code/module.py	Fri Jan  9 17:23:30 2004
@@ -17,8 +17,8 @@
 
 from zope.interface import implements
 
-from persistence import Persistent
-from persistence._persistence import GHOST
+from persistent import Persistent
+from persistent.cPersistence import GHOST
 from zodb.code.interfaces import IPersistentModuleManager
 from zodb.code.interfaces \
      import IPersistentModuleImportRegistry, IPersistentModuleUpdateRegistry


=== Zope3/src/zodb/code/patch.py 1.14 => 1.14.4.1 ===
--- Zope3/src/zodb/code/patch.py:1.14	Mon Nov  3 16:43:29 2003
+++ Zope3/src/zodb/code/patch.py	Fri Jan  9 17:23:30 2004
@@ -93,7 +93,6 @@
 
 from zodb.code.class_ import PersistentClassMetaClass, PersistentDescriptor
 from zodb.code.function import PersistentFunction
-from persistence import PersistentMetaClass
 
 class Wrapper:
     """Implement pickling reduce protocol for update-able object.
@@ -239,7 +238,7 @@
 
     dispatch[TypeType] = save_type
     dispatch[ClassType] = save_type
-    dispatch[PersistentMetaClass] = save_type
+    dispatch[type] = save_type
     dispatch[PersistentClassMetaClass] = save_type
 
     def save_function(self, func):