[Zodb-checkins] CVS: ZODB3/BDBStorage/tests - timepickles.py:1.4.2.1 timeiter.py:1.5.2.1 test_zodb_simple.py:1.13.2.1 test_whitebox.py:1.7.2.1 test_virgin.py:1.14.2.1 test_autopack.py:1.13.4.2

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/BDBStorage/tests
In directory cvs.zope.org:/tmp/cvs-serv26665/BDBStorage/tests

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	timepickles.py timeiter.py test_zodb_simple.py 
	test_whitebox.py test_virgin.py test_autopack.py 
Log Message:
Merge the head to the mvcc branch.

This merge should be the final preparation for merging the branch to
the trunk.


=== ZODB3/BDBStorage/tests/timepickles.py 1.4 => 1.4.2.1 ===
--- ZODB3/BDBStorage/tests/timepickles.py:1.4	Thu Oct  2 14:17:31 2003
+++ ZODB3/BDBStorage/tests/timepickles.py	Tue Dec 23 14:06:23 2003
@@ -63,7 +63,7 @@
 from bsddb3 import db
 
 from ZODB import utils
-from ZODB.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
 from ZODB.FileStorage import FileStorage
 from BDBStorage.BDBFullStorage import BDBFullStorage
 


=== ZODB3/BDBStorage/tests/timeiter.py 1.5 => 1.5.2.1 ===
--- ZODB3/BDBStorage/tests/timeiter.py:1.5	Thu Oct  2 14:17:31 2003
+++ ZODB3/BDBStorage/tests/timeiter.py	Tue Dec 23 14:06:23 2003
@@ -63,7 +63,7 @@
 from bsddb3 import db
 
 from ZODB import utils
-from ZODB.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
 from ZODB.FileStorage import FileStorage
 from BDBStorage.BDBFullStorage import BDBFullStorage
 


=== ZODB3/BDBStorage/tests/test_zodb_simple.py 1.13 => 1.13.2.1 ===
--- ZODB3/BDBStorage/tests/test_zodb_simple.py:1.13	Thu Oct  2 18:14:00 2003
+++ ZODB3/BDBStorage/tests/test_zodb_simple.py	Tue Dec 23 14:06:23 2003
@@ -21,7 +21,7 @@
 
 import BDBStorage
 from BDBStorage.tests.ZODBTestBase import ZODBTestBase
-from Persistence import PersistentMapping
+from persistent.mapping import PersistentMapping
 
 
 


=== ZODB3/BDBStorage/tests/test_whitebox.py 1.7 => 1.7.2.1 ===
--- ZODB3/BDBStorage/tests/test_whitebox.py:1.7	Thu Oct  2 18:14:00 2003
+++ ZODB3/BDBStorage/tests/test_whitebox.py	Tue Dec 23 14:06:23 2003
@@ -32,7 +32,7 @@
 from BDBStorage.tests.ZODBTestBase import ZODBTestBase
 from BDBStorage.tests.BerkeleyTestBase import BerkeleyTestBase
 
-from Persistence import Persistent
+from persistent import Persistent
 
 ZERO = '\0'*8
 


=== ZODB3/BDBStorage/tests/test_virgin.py 1.14 => 1.14.2.1 ===
--- ZODB3/BDBStorage/tests/test_virgin.py:1.14	Thu Oct  2 14:17:31 2003
+++ ZODB3/BDBStorage/tests/test_virgin.py	Tue Dec 23 14:06:23 2003
@@ -18,8 +18,7 @@
 
 import BDBStorage
 from BDBStorage.tests.ZODBTestBase import ZODBTestBase
-from Persistence import PersistentMapping
-
+from persistent.mapping import PersistentMapping
 
 
 class InsertMixin:


=== ZODB3/BDBStorage/tests/test_autopack.py 1.13.4.1 => 1.13.4.2 ===
--- ZODB3/BDBStorage/tests/test_autopack.py:1.13.4.1	Mon Nov 24 13:13:23 2003
+++ ZODB3/BDBStorage/tests/test_autopack.py	Tue Dec 23 14:06:23 2003
@@ -17,13 +17,14 @@
 import unittest
 import threading
 
+from persistent.TimeStamp import TimeStamp
+
 from ZODB import DB
 from ZODB.Transaction import Transaction
 from ZODB.referencesf import referencesf
-from ZODB.TimeStamp import TimeStamp
 from ZODB.tests.MinPO import MinPO
 from ZODB.tests.StorageTestBase import zodb_pickle
-from Persistence import Persistent
+from persistent import Persistent
 
 import BDBStorage
 if BDBStorage.is_available: