summaryrefslogtreecommitdiff
path: root/Tools/pybench/Setup.py
diff options
context:
space:
mode:
authorMarc-André Lemburg <mal@egenix.com>2006-06-13 18:56:56 +0000
committerMarc-André Lemburg <mal@egenix.com>2006-06-13 18:56:56 +0000
commit7d9743dd6aebe3da1118ed7f0abb7b9cdc6302ff (patch)
tree5fd8c25b53d192efbd69cbd42e6ae4016a215db0 /Tools/pybench/Setup.py
parentef7fe5f228292733965c87b99d50a21d64c6d196 (diff)
downloadcpython-git-7d9743dd6aebe3da1118ed7f0abb7b9cdc6302ff.tar.gz
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.
Diffstat (limited to 'Tools/pybench/Setup.py')
-rw-r--r--Tools/pybench/Setup.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/pybench/Setup.py b/Tools/pybench/Setup.py
index f5c519047e..f1417e6c3f 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 Lookups import *
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 *