[Zope-Checkins] CVS: Zope/lib/python/BDBStorage/tests - test_autopack.py:1.14 test_virgin.py:1.15 test_whitebox.py:1.8 test_zodb_simple.py:1.14 timeiter.py:1.6 timepickles.py:1.5

[Jim Fulton]

Update of /cvs-repository/Zope/lib/python/BDBStorage/tests
In directory cvs.zope.org:/tmp/cvs-serv3783/lib/python/BDBStorage/tests

Modified Files:
	test_autopack.py test_virgin.py test_whitebox.py 
	test_zodb_simple.py timeiter.py timepickles.py 
Log Message:
Merged Jeremy and Tim's changes from the zodb33-devel-branch.


=== Zope/lib/python/BDBStorage/tests/test_autopack.py 1.13 => 1.14 ===
--- Zope/lib/python/BDBStorage/tests/test_autopack.py:1.13	Mon Sep 15 12:29:22 2003
+++ Zope/lib/python/BDBStorage/tests/test_autopack.py	Fri Nov 28 11:44:43 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:


=== Zope/lib/python/BDBStorage/tests/test_virgin.py 1.14 => 1.15 ===
--- Zope/lib/python/BDBStorage/tests/test_virgin.py:1.14	Thu Oct  2 14:17:31 2003
+++ Zope/lib/python/BDBStorage/tests/test_virgin.py	Fri Nov 28 11:44:43 2003
@@ -18,8 +18,7 @@
 
 import BDBStorage
 from BDBStorage.tests.ZODBTestBase import ZODBTestBase
-from Persistence import PersistentMapping
-
+from persistent.mapping import PersistentMapping
 
 
 class InsertMixin:


=== Zope/lib/python/BDBStorage/tests/test_whitebox.py 1.7 => 1.8 ===
--- Zope/lib/python/BDBStorage/tests/test_whitebox.py:1.7	Thu Oct  2 18:14:00 2003
+++ Zope/lib/python/BDBStorage/tests/test_whitebox.py	Fri Nov 28 11:44:43 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
 


=== Zope/lib/python/BDBStorage/tests/test_zodb_simple.py 1.13 => 1.14 ===
--- Zope/lib/python/BDBStorage/tests/test_zodb_simple.py:1.13	Thu Oct  2 18:14:00 2003
+++ Zope/lib/python/BDBStorage/tests/test_zodb_simple.py	Fri Nov 28 11:44:43 2003
@@ -21,7 +21,7 @@
 
 import BDBStorage
 from BDBStorage.tests.ZODBTestBase import ZODBTestBase
-from Persistence import PersistentMapping
+from persistent.mapping import PersistentMapping
 
 
 


=== Zope/lib/python/BDBStorage/tests/timeiter.py 1.5 => 1.6 ===
--- Zope/lib/python/BDBStorage/tests/timeiter.py:1.5	Thu Oct  2 14:17:31 2003
+++ Zope/lib/python/BDBStorage/tests/timeiter.py	Fri Nov 28 11:44:43 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
 


=== Zope/lib/python/BDBStorage/tests/timepickles.py 1.4 => 1.5 ===
--- Zope/lib/python/BDBStorage/tests/timepickles.py:1.4	Thu Oct  2 14:17:31 2003
+++ Zope/lib/python/BDBStorage/tests/timepickles.py	Fri Nov 28 11:44:43 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