[Zope-Checkins] CVS: ZODB3/ZODB/tests - StorageTestBase.py:1.18 Synchronization.py:1.7

Guido van Rossum guido@python.org
Wed, 30 Oct 2002 16:20:05 -0500


Update of /cvs-repository/ZODB3/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv31412/tests

Modified Files:
	StorageTestBase.py Synchronization.py 
Log Message:
Don't use apply(), use f(foo, *args, *kwargs).

=== ZODB3/ZODB/tests/StorageTestBase.py 1.17 => 1.18 ===
--- ZODB3/ZODB/tests/StorageTestBase.py:1.17	Wed Aug 14 18:07:09 2002
+++ ZODB3/ZODB/tests/StorageTestBase.py	Wed Oct 30 16:20:05 2002
@@ -100,8 +100,7 @@
 
     A helper for function _handle_all_serials().
     """
-    args = (oid,) + args
-    return apply(handle_all_serials, args)[oid]
+    return handle_all_serials(oid, *args)[oid]
 
 def import_helper(name):
     mod = __import__(name)


=== ZODB3/ZODB/tests/Synchronization.py 1.6 => 1.7 ===
--- ZODB3/ZODB/tests/Synchronization.py:1.6	Wed Aug 14 18:07:09 2002
+++ ZODB3/ZODB/tests/Synchronization.py	Wed Oct 30 16:20:05 2002
@@ -63,8 +63,7 @@
 ##        self.assertRaises(StorageTransactionError, callable *args)
 
     def verifyNotCommitting(self, callable, *args):
-        args = (StorageTransactionError, callable) + args
-        apply(self.assertRaises, args)
+        self.assertRaises(StorageTransactionError, callable, *args)
 
     def verifyWrongTrans(self, callable, *args):
         t = Transaction()