Whack-a-mole salad.

zopefoundation · Jan 14, 2013 · ab03100 · ab03100
1 parent 6d13604
commit ab03100
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/ZODB/tests/MTStorage.py b/src/ZODB/tests/MTStorage.py
@@ -6,7 +6,7 @@
 from persistent.mapping import PersistentMapping
 import transaction
 
-import ZODB.DB
+from ZODB.DB import DB
 from ZODB.tests.StorageTestBase import zodb_pickle, zodb_unpickle
 from ZODB.tests.StorageTestBase import handle_serials
 from ZODB.tests.MinPO import MinPO
@@ -226,12 +226,12 @@ def _checkNThreads(self, n, constructor, *args):
             self.failIf(t.isAlive(), "thread failed to finish in 60 seconds")
 
     def check2ZODBThreads(self):
-        db = ZODB.DB.DB(self._storage)
+        db = DB(self._storage)
         self._checkNThreads(2, ZODBClientThread, db, self)
         db.close()
 
     def check7ZODBThreads(self):
-        db = ZODB.DB.DB(self._storage)
+        db = DB(self._storage)
         self._checkNThreads(7, ZODBClientThread, db, self)
         db.close()
 

diff --git a/src/ZODB/tests/PackableStorage.py b/src/ZODB/tests/PackableStorage.py
@@ -16,7 +16,7 @@
 from cStringIO import StringIO
 from persistent import Persistent
 from persistent.mapping import PersistentMapping
-from ZODB import DB
+from ZODB.DB import DB
 from ZODB.POSException import ConflictError, StorageError
 from ZODB.serialize import referencesf
 from ZODB.tests.MinPO import MinPO

diff --git a/src/ZODB/tests/RecoveryStorage.py b/src/ZODB/tests/RecoveryStorage.py
@@ -17,7 +17,7 @@
 from transaction import Transaction
 from ZODB.tests.IteratorStorage import IteratorDeepCompare
 from ZODB.tests.StorageTestBase import MinPO, snooze
-from ZODB import DB
+from ZODB.DB import DB
 from ZODB.serialize import referencesf
 
 import time

diff --git a/src/ZODB/tests/TransactionalUndoStorage.py b/src/ZODB/tests/TransactionalUndoStorage.py
@@ -25,7 +25,7 @@
 from ZODB import POSException
 from ZODB.serialize import referencesf
 from ZODB.utils import p64
-from ZODB import DB
+from ZODB.DB import DB
 
 from ZODB.tests.MinPO import MinPO
 from ZODB.tests.StorageTestBase import zodb_pickle, zodb_unpickle