Issue #4704: remove use of cmp() in pybench, bump its version number to 2.1,
and make it 2.6-compatible.
diff --git a/Tools/pybench/README b/Tools/pybench/README
index 022c8de..b015124 100644
--- a/Tools/pybench/README
+++ b/Tools/pybench/README
@@ -82,7 +82,7 @@
--examples show examples of usage
Version:
- 2.0
+ 2.1
The normal operation is to run the suite and display the
results. Use -f to save them for later reuse or comparisons.
@@ -95,9 +95,9 @@
Examples:
-python2.1 pybench.py -f p21.pybench
-python2.5 pybench.py -f p25.pybench
-python pybench.py -s p25.pybench -c p21.pybench
+python3.0 pybench.py -f p30.pybench
+python3.1 pybench.py -f p31.pybench
+python pybench.py -s p31.pybench -c p30.pybench
"""
License
@@ -111,9 +111,9 @@
"""
-------------------------------------------------------------------------------
-PYBENCH 2.0
+PYBENCH 2.1
-------------------------------------------------------------------------------
-* using Python 2.4.2
+* using CPython 3.0
* disabled garbage collection
* system check interval set to maximum: 2147483647
* using timer: time.time
@@ -141,8 +141,9 @@
Processor: x86_64
Python:
+ Implementation: CPython
Executable: /usr/local/bin/python
- Version: 2.4.2
+ Version: 3.0
Compiler: GCC 3.3.4 (pre 3.3.5 20040809)
Bits: 64bit
Build: Oct 1 2005 15:24:35 (#1)
@@ -331,6 +332,11 @@
Version History
---------------
+ 2.1: made some minor changes for compatibility with Python 3.0:
+ - replaced cmp with divmod and range with max in Calls.py
+ (cmp no longer exists in 3.0, and range is a list in
+ Python 2.x and an iterator in Python 3.x)
+
2.0: rewrote parts of pybench which resulted in more repeatable
timings:
- made timer a parameter