Updated to pybench 2.0.
See svn.python.org/external/pybench-2.0 for the original import of that
version.
Note that platform.py was not copied over from pybench-2.0 since
it is already part of Python 2.5.
diff --git a/Tools/pybench/Setup.py b/Tools/pybench/Setup.py
index f5c5190..f1417e6 100644
--- a/Tools/pybench/Setup.py
+++ b/Tools/pybench/Setup.py
@@ -14,7 +14,7 @@
# Defaults
Number_of_rounds = 10
-Warp_factor = 20
+Warp_factor = 10
# Import tests
from Arithmetic import *
@@ -24,8 +24,8 @@
from Instances import *
try:
from NewInstances import *
-except:
- print "Cannot test new-style objects"
+except ImportError:
+ pass
from Lists import *
from Tuples import *
from Dict import *