Get rid of many apply() calls.
diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py
index 30439a4..d3c2e3f 100644
--- a/Lib/test/test_extcall.py
+++ b/Lib/test/test_extcall.py
@@ -239,5 +239,5 @@
kwdict = {}
for k in kwargs: kwdict[k] = k + k
print func.func_name, args, sortdict(kwdict), '->',
- try: apply(func, args, kwdict)
+ try: func(*args, **kwdict)
except TypeError, err: print err
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index b9895d4..bc0ace8 100644
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -1,6 +1,5 @@
from test.test_support import TestFailed, verbose, verify
import struct
-## import pdb
import sys
ISBIGENDIAN = sys.byteorder == "big"
@@ -21,23 +20,21 @@
def simple_err(func, *args):
try:
- apply(func, args)
+ func(*args)
except struct.error:
pass
else:
raise TestFailed, "%s%s did not raise struct.error" % (
func.__name__, args)
-## pdb.set_trace()
def any_err(func, *args):
try:
- apply(func, args)
+ func(*args)
except (struct.error, OverflowError, TypeError):
pass
else:
raise TestFailed, "%s%s did not raise error" % (
func.__name__, args)
-## pdb.set_trace()
simple_err(struct.calcsize, 'Z')