[Zope-CVS] CVS: Products/Ape/lib/apelib/tests - teststorage.py:1.8 zope2testbase.py:1.9

[Shane Hathaway]

Update of /cvs-repository/Products/Ape/lib/apelib/tests
In directory cvs.zope.org:/tmp/cvs-serv24897/lib/apelib/tests

Modified Files:
	teststorage.py zope2testbase.py 
Log Message:
Made shallowly compatible with the Zope head.

Deeper compabitility will take advantage of the refined ZODB
Connection class.



=== Products/Ape/lib/apelib/tests/teststorage.py 1.7 => 1.8 ===
--- Products/Ape/lib/apelib/tests/teststorage.py:1.7	Sat Feb 28 15:06:28 2004
+++ Products/Ape/lib/apelib/tests/teststorage.py	Mon Mar  1 09:13:54 2004
@@ -20,7 +20,7 @@
 from thread import start_new_thread, allocate_lock
 
 import ZODB
-from Persistence import PersistentMapping
+from Persistence import Persistent, PersistentMapping
 
 from apelib.zodb3.db import ApeDB
 from apelib.zodb3.storage import ApeStorage
@@ -286,7 +286,7 @@
     def testCopyOfZClassInstance(self):
         # Verifies that copyOf() can copy instances that look like ZClass
         # instances.
-        class weird_class (ZODB.Persistent):
+        class weird_class (Persistent):
             pass
         weird_class.__module__ = '*IAmAZClassModule'
         self.assertEqual(weird_class.__module__, '*IAmAZClassModule')


=== Products/Ape/lib/apelib/tests/zope2testbase.py 1.8 => 1.9 ===
--- Products/Ape/lib/apelib/tests/zope2testbase.py:1.8	Sat Feb 28 15:06:28 2004
+++ Products/Ape/lib/apelib/tests/zope2testbase.py	Mon Mar  1 09:13:54 2004
@@ -21,7 +21,8 @@
 from types import ListType, TupleType
 
 from Acquisition import aq_base
-from ZODB import Persistent, POSException
+from Persistence import Persistent
+from ZODB import POSException
 from Persistence import PersistentMapping
 from OFS.Folder import Folder
 from OFS.ObjectManager import ObjectManager