[Zope3-checkins] CVS: Zope3/lib/python/ZODB/tests - MTStorage.py:1.7 PackableStorage.py:1.14 testZODB.py:1.6

[Jeremy Hylton]

Update of /cvs-repository/Zope3/lib/python/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv31710/ZODB/tests

Modified Files:
	MTStorage.py PackableStorage.py testZODB.py 
Log Message:
Limit the trickery in Persistence/__init__.py.

User code should get PersistentMapping and PersistentList from their
modules explicitly.  Fixup several Zope modules that use
PersistentMapping.




=== Zope3/lib/python/ZODB/tests/MTStorage.py 1.6 => 1.7 ===
 import time
 
 import ZODB.DB
-from Persistence import PersistentMapping
+from Persistence.PersistentMapping import PersistentMapping
 from Transaction import Transaction, get_transaction
 
 from ZODB.tests.StorageTestBase \


=== Zope3/lib/python/ZODB/tests/PackableStorage.py 1.13 => 1.14 ===
         try:
             self._storage.load(ZERO, '')
         except KeyError:
-            from Persistence import PersistentMapping
+            from Persistence.PersistentMapping import PersistentMapping
             from Transaction import Transaction
             file = StringIO()
             p = cPickle.Pickler(file, 1)


=== Zope3/lib/python/ZODB/tests/testZODB.py 1.5 => 1.6 ===
 import unittest
 
 import ZODB.DB, ZODB.FileStorage
-from Persistence import PersistentMapping
+from Persistence.PersistentMapping import PersistentMapping
 from Transaction import get_transaction
 
 class ExportImportTests: