Whitespace normalization.
diff --git a/Tools/pybench/Arithmetic.py b/Tools/pybench/Arithmetic.py
index e95c30a..4ed6219 100644
--- a/Tools/pybench/Arithmetic.py
+++ b/Tools/pybench/Arithmetic.py
@@ -775,4 +775,3 @@
for i in xrange(self.rounds):
pass
-
diff --git a/Tools/pybench/Calls.py b/Tools/pybench/Calls.py
index 82e7a91..e295243 100644
--- a/Tools/pybench/Calls.py
+++ b/Tools/pybench/Calls.py
@@ -407,4 +407,3 @@
for i in xrange(self.rounds):
pass
-
diff --git a/Tools/pybench/CommandLine.py b/Tools/pybench/CommandLine.py
index fb7e07b..13e4f9b 100644
--- a/Tools/pybench/CommandLine.py
+++ b/Tools/pybench/CommandLine.py
@@ -7,7 +7,7 @@
TODO:
* Incorporate the changes made by (see Inbox)
- * Add number range option using srange()
+ * Add number range option using srange()
"""
@@ -194,7 +194,7 @@
""" Option that takes an argument.
An optional default argument can be given.
-
+
"""
def __init__(self,name,help=None,default=None):
@@ -299,7 +299,7 @@
values = None # Dictionary of passed options (or default values)
# indexed by the options name, e.g. '-h'
files = None # List of passed filenames
- optionlist = None # List of passed options
+ optionlist = None # List of passed options
def __init__(self,argv=None):
@@ -318,15 +318,15 @@
# Init .arguments list
self.arguments = argv[1:]
-
+
# Setup Option mapping
self.option_map = option_dict(self.options)
-
+
# Append preset options
for option in self.preset_options:
if not self.option_map.has_key(option.name):
self.add_option(option)
-
+
# Init .files list
self.files = []
@@ -336,12 +336,12 @@
rc = self.startup()
if rc is not None:
raise SystemExit,rc
-
+
# Parse command line
rc = self.parse()
if rc is not None:
raise SystemExit,rc
-
+
# Start application
rc = self.main()
if rc is None:
@@ -375,7 +375,7 @@
Note that this has to be done *before* .parse() is being
executed.
-
+
"""
self.options.append(option)
self.option_map[option.name] = option
@@ -481,10 +481,10 @@
This may modify filelist in place. A typical application
is checking that at least n files are given.
-
+
If this method returns anything other than None, the
process is terminated with the return value as exit code.
-
+
"""
return None
@@ -554,19 +554,19 @@
""" This may process the files list in place.
"""
return None
-
+
# Short option handler
def handle_h(self,arg):
self.help()
return 0
-
+
def handle_v(self, value):
""" Turn on verbose output.
"""
self.verbose = 1
-
+
# Handlers for long options have two underscores in their name
def handle__help(self,arg):
@@ -607,7 +607,7 @@
it is None, 0 is assumed (meaning OK). Unhandled
exceptions are reported with exit status code 1 (see
__init__ for further details).
-
+
"""
return None
@@ -620,7 +620,7 @@
header = 'Test Application'
version = __version__
options = [Option('-v','verbose')]
-
+
def handle_v(self,arg):
print 'VERBOSE, Yeah !'
diff --git a/Tools/pybench/Constructs.py b/Tools/pybench/Constructs.py
index aba888f..00045bd 100644
--- a/Tools/pybench/Constructs.py
+++ b/Tools/pybench/Constructs.py
@@ -562,4 +562,3 @@
l1 = range(1000)
for i in xrange(self.rounds):
pass
-
diff --git a/Tools/pybench/Dict.py b/Tools/pybench/Dict.py
index 207d88f..54aeae7 100644
--- a/Tools/pybench/Dict.py
+++ b/Tools/pybench/Dict.py
@@ -93,70 +93,70 @@
d['jkl'] = 4
d['mno'] = 5
d['pqr'] = 6
-
+
d['abc']
d['def']
d['ghi']
d['jkl']
d['mno']
d['pqr']
-
+
d['abc'] = 1
d['def'] = 2
d['ghi'] = 3
d['jkl'] = 4
d['mno'] = 5
d['pqr'] = 6
-
+
d['abc']
d['def']
d['ghi']
d['jkl']
d['mno']
d['pqr']
-
+
d['abc'] = 1
d['def'] = 2
d['ghi'] = 3
d['jkl'] = 4
d['mno'] = 5
d['pqr'] = 6
-
+
d['abc']
d['def']
d['ghi']
d['jkl']
d['mno']
d['pqr']
-
+
d['abc'] = 1
d['def'] = 2
d['ghi'] = 3
d['jkl'] = 4
d['mno'] = 5
d['pqr'] = 6
-
+
d['abc']
d['def']
d['ghi']
d['jkl']
d['mno']
d['pqr']
-
+
d['abc'] = 1
d['def'] = 2
d['ghi'] = 3
d['jkl'] = 4
d['mno'] = 5
d['pqr'] = 6
-
+
d['abc']
d['def']
d['ghi']
d['jkl']
d['mno']
d['pqr']
-
+
def calibrate(self):
d = {}
@@ -182,70 +182,70 @@
d[4.567] = 4
d[5.678] = 5
d[6.789] = 6
-
+
d[1.234]
d[2.345]
d[3.456]
d[4.567]
d[5.678]
d[6.789]
-
+
d[1.234] = 1
d[2.345] = 2
d[3.456] = 3
d[4.567] = 4
d[5.678] = 5
d[6.789] = 6
-
+
d[1.234]
d[2.345]
d[3.456]
d[4.567]
d[5.678]
d[6.789]
-
+
d[1.234] = 1
d[2.345] = 2
d[3.456] = 3
d[4.567] = 4
d[5.678] = 5
d[6.789] = 6
-
+
d[1.234]
d[2.345]
d[3.456]
d[4.567]
d[5.678]
d[6.789]
-
+
d[1.234] = 1
d[2.345] = 2
d[3.456] = 3
d[4.567] = 4
d[5.678] = 5
d[6.789] = 6
-
+
d[1.234]
d[2.345]
d[3.456]
d[4.567]
d[5.678]
d[6.789]
-
+
d[1.234] = 1
d[2.345] = 2
d[3.456] = 3
d[4.567] = 4
d[5.678] = 5
d[6.789] = 6
-
+
d[1.234]
d[2.345]
d[3.456]
d[4.567]
d[5.678]
d[6.789]
-
+
def calibrate(self):
d = {}
@@ -271,70 +271,70 @@
d[4] = 4
d[5] = 5
d[6] = 6
-
+
d[1]
d[2]
d[3]
d[4]
d[5]
d[6]
-
+
d[1] = 1
d[2] = 2
d[3] = 3
d[4] = 4
d[5] = 5
d[6] = 6
-
+
d[1]
d[2]
d[3]
d[4]
d[5]
d[6]
-
+
d[1] = 1
d[2] = 2
d[3] = 3
d[4] = 4
d[5] = 5
d[6] = 6
-
+
d[1]
d[2]
d[3]
d[4]
d[5]
d[6]
-
+
d[1] = 1
d[2] = 2
d[3] = 3
d[4] = 4
d[5] = 5
d[6] = 6
-
+
d[1]
d[2]
d[3]
d[4]
d[5]
d[6]
-
+
d[1] = 1
d[2] = 2
d[3] = 3
d[4] = 4
d[5] = 5
d[6] = 6
-
+
d[1]
d[2]
d[3]
d[4]
d[5]
d[6]
-
+
def calibrate(self):
d = {}
@@ -360,7 +360,7 @@
d[3] = 3
d[4] = 4
d[5] = 5
-
+
x = d[0]
x = d[1]
x = d[2]
@@ -388,7 +388,7 @@
d[3] = 3
d[4] = 4
d[5] = 5
-
+
x = d[0]
x = d[1]
x = d[2]
@@ -416,7 +416,7 @@
d[3] = 3
d[4] = 4
d[5] = 5
-
+
x = d[0]
x = d[1]
x = d[2]
@@ -444,7 +444,7 @@
d[3] = 3
d[4] = 4
d[5] = 5
-
+
x = d[0]
x = d[1]
x = d[2]
@@ -472,7 +472,7 @@
d[3] = 3
d[4] = 4
d[5] = 5
-
+
x = d[0]
x = d[1]
x = d[2]
@@ -500,4 +500,3 @@
for i in xrange(self.rounds):
pass
-
diff --git a/Tools/pybench/Exceptions.py b/Tools/pybench/Exceptions.py
index 295c83a..7e55708 100644
--- a/Tools/pybench/Exceptions.py
+++ b/Tools/pybench/Exceptions.py
@@ -38,7 +38,7 @@
for i in xrange(self.rounds):
pass
-
+
class TryExcept(Test):
@@ -677,5 +677,3 @@
for i in xrange(self.rounds):
pass
-
-
diff --git a/Tools/pybench/Imports.py b/Tools/pybench/Imports.py
index eb458b4..85eb604 100644
--- a/Tools/pybench/Imports.py
+++ b/Tools/pybench/Imports.py
@@ -47,7 +47,7 @@
for i in xrange(self.rounds):
pass
-
+
class SecondPackageImport(Test):
@@ -92,7 +92,7 @@
for i in xrange(self.rounds):
pass
-
+
class SecondSubmoduleImport(Test):
version = 0.1
@@ -136,4 +136,3 @@
for i in xrange(self.rounds):
pass
-
diff --git a/Tools/pybench/Instances.py b/Tools/pybench/Instances.py
index 7663e23..9b1929d 100644
--- a/Tools/pybench/Instances.py
+++ b/Tools/pybench/Instances.py
@@ -64,5 +64,3 @@
for i in xrange(self.rounds):
pass
-
-
diff --git a/Tools/pybench/Lists.py b/Tools/pybench/Lists.py
index a06b44c..4c18e99 100644
--- a/Tools/pybench/Lists.py
+++ b/Tools/pybench/Lists.py
@@ -25,7 +25,7 @@
l[3] = 3
l[4] = 4
l[5] = 5
-
+
x = l[0]
x = l[1]
x = l[2]
@@ -46,7 +46,7 @@
l[3] = 3
l[4] = 4
l[5] = 5
-
+
x = l[0]
x = l[1]
x = l[2]
@@ -67,7 +67,7 @@
l[3] = 3
l[4] = 4
l[5] = 5
-
+
x = l[0]
x = l[1]
x = l[2]
@@ -88,7 +88,7 @@
l[3] = 3
l[4] = 4
l[5] = 5
-
+
x = l[0]
x = l[1]
x = l[2]
@@ -109,7 +109,7 @@
l[3] = 3
l[4] = 4
l[5] = 5
-
+
x = l[0]
x = l[1]
x = l[2]
@@ -190,11 +190,11 @@
l[3] = 3
l[4] = 4
l[5] = 5
-
+
l[:3] = [1,2,3]
m = l[:-1]
m = l[1:]
-
+
l[-1:] = [4,5,6]
l = []
@@ -212,11 +212,11 @@
l[3] = 3
l[4] = 4
l[5] = 5
-
+
l[:3] = [1,2,3]
m = l[:-1]
m = l[1:]
-
+
l[-1:] = [4,5,6]
l = []
@@ -234,11 +234,11 @@
l[3] = 3
l[4] = 4
l[5] = 5
-
+
l[:3] = [1,2,3]
m = l[:-1]
m = l[1:]
-
+
l[-1:] = [4,5,6]
l = []
@@ -256,11 +256,11 @@
l[3] = 3
l[4] = 4
l[5] = 5
-
+
l[:3] = [1,2,3]
m = l[:-1]
m = l[1:]
-
+
l[-1:] = [4,5,6]
l = []
@@ -278,15 +278,14 @@
l[3] = 3
l[4] = 4
l[5] = 5
-
+
l[:3] = [1,2,3]
m = l[:-1]
m = l[1:]
-
+
l[-1:] = [4,5,6]
def calibrate(self):
for i in xrange(self.rounds):
l = []
-
diff --git a/Tools/pybench/Lookups.py b/Tools/pybench/Lookups.py
index fbbc0ed..e5529cd 100644
--- a/Tools/pybench/Lookups.py
+++ b/Tools/pybench/Lookups.py
@@ -943,4 +943,3 @@
for i in xrange(self.rounds):
pass
-
diff --git a/Tools/pybench/Numbers.py b/Tools/pybench/Numbers.py
index 75cf2ed..a6aea33 100644
--- a/Tools/pybench/Numbers.py
+++ b/Tools/pybench/Numbers.py
@@ -15,55 +15,7 @@
2 == 3
2 > 3
2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
+
2 < 3
2 > 3
2 == 3
@@ -75,55 +27,7 @@
2 == 3
2 > 3
2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
- 2 < 3
- 2 > 3
- 2 == 3
- 2 > 3
- 2 < 3
-
+
2 < 3
2 > 3
2 == 3
@@ -135,55 +39,151 @@
2 == 3
2 > 3
2 < 3
-
+
2 < 3
2 > 3
2 == 3
2 > 3
2 < 3
-
+
2 < 3
2 > 3
2 == 3
2 > 3
2 < 3
-
+
2 < 3
2 > 3
2 == 3
2 > 3
2 < 3
-
+
2 < 3
2 > 3
2 == 3
2 > 3
2 < 3
-
+
2 < 3
2 > 3
2 == 3
2 > 3
2 < 3
-
+
2 < 3
2 > 3
2 == 3
2 > 3
2 < 3
-
+
2 < 3
2 > 3
2 == 3
2 > 3
2 < 3
-
+
2 < 3
2 > 3
2 == 3
2 > 3
2 < 3
-
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
+ 2 < 3
+ 2 > 3
+ 2 == 3
+ 2 > 3
+ 2 < 3
+
2 < 3
2 > 3
2 == 3
@@ -211,55 +211,7 @@
2.1 == 3.31
2.1 > 3.31
2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
+
2.1 < 3.31
2.1 > 3.31
2.1 == 3.31
@@ -271,55 +223,7 @@
2.1 == 3.31
2.1 > 3.31
2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
- 2.1 < 3.31
- 2.1 > 3.31
- 2.1 == 3.31
- 2.1 > 3.31
- 2.1 < 3.31
-
+
2.1 < 3.31
2.1 > 3.31
2.1 == 3.31
@@ -331,55 +235,151 @@
2.1 == 3.31
2.1 > 3.31
2.1 < 3.31
-
+
2.1 < 3.31
2.1 > 3.31
2.1 == 3.31
2.1 > 3.31
2.1 < 3.31
-
+
2.1 < 3.31
2.1 > 3.31
2.1 == 3.31
2.1 > 3.31
2.1 < 3.31
-
+
2.1 < 3.31
2.1 > 3.31
2.1 == 3.31
2.1 > 3.31
2.1 < 3.31
-
+
2.1 < 3.31
2.1 > 3.31
2.1 == 3.31
2.1 > 3.31
2.1 < 3.31
-
+
2.1 < 3.31
2.1 > 3.31
2.1 == 3.31
2.1 > 3.31
2.1 < 3.31
-
+
2.1 < 3.31
2.1 > 3.31
2.1 == 3.31
2.1 > 3.31
2.1 < 3.31
-
+
2.1 < 3.31
2.1 > 3.31
2.1 == 3.31
2.1 > 3.31
2.1 < 3.31
-
+
2.1 < 3.31
2.1 > 3.31
2.1 == 3.31
2.1 > 3.31
2.1 < 3.31
-
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
+ 2.1 < 3.31
+ 2.1 > 3.31
+ 2.1 == 3.31
+ 2.1 > 3.31
+ 2.1 < 3.31
+
2.1 < 3.31
2.1 > 3.31
2.1 == 3.31
@@ -407,55 +407,7 @@
2.1 == 4
2.1 > 4
2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
+
2.1 < 4
2.1 > 4
2.1 == 4
@@ -467,55 +419,7 @@
2.1 == 4
2.1 > 4
2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
- 2.1 < 4
- 2.1 > 4
- 2.1 == 4
- 2.1 > 4
- 2.1 < 4
-
+
2.1 < 4
2.1 > 4
2.1 == 4
@@ -527,55 +431,151 @@
2.1 == 4
2.1 > 4
2.1 < 4
-
+
2.1 < 4
2.1 > 4
2.1 == 4
2.1 > 4
2.1 < 4
-
+
2.1 < 4
2.1 > 4
2.1 == 4
2.1 > 4
2.1 < 4
-
+
2.1 < 4
2.1 > 4
2.1 == 4
2.1 > 4
2.1 < 4
-
+
2.1 < 4
2.1 > 4
2.1 == 4
2.1 > 4
2.1 < 4
-
+
2.1 < 4
2.1 > 4
2.1 == 4
2.1 > 4
2.1 < 4
-
+
2.1 < 4
2.1 > 4
2.1 == 4
2.1 > 4
2.1 < 4
-
+
2.1 < 4
2.1 > 4
2.1 == 4
2.1 > 4
2.1 < 4
-
+
2.1 < 4
2.1 > 4
2.1 == 4
2.1 > 4
2.1 < 4
-
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
+ 2.1 < 4
+ 2.1 > 4
+ 2.1 == 4
+ 2.1 > 4
+ 2.1 < 4
+
2.1 < 4
2.1 > 4
2.1 == 4
@@ -603,55 +603,7 @@
1234567890L == 3456789012345L
1234567890L > 3456789012345L
1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
+
1234567890L < 3456789012345L
1234567890L > 3456789012345L
1234567890L == 3456789012345L
@@ -663,55 +615,7 @@
1234567890L == 3456789012345L
1234567890L > 3456789012345L
1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
- 1234567890L < 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L == 3456789012345L
- 1234567890L > 3456789012345L
- 1234567890L < 3456789012345L
-
+
1234567890L < 3456789012345L
1234567890L > 3456789012345L
1234567890L == 3456789012345L
@@ -723,55 +627,151 @@
1234567890L == 3456789012345L
1234567890L > 3456789012345L
1234567890L < 3456789012345L
-
+
1234567890L < 3456789012345L
1234567890L > 3456789012345L
1234567890L == 3456789012345L
1234567890L > 3456789012345L
1234567890L < 3456789012345L
-
+
1234567890L < 3456789012345L
1234567890L > 3456789012345L
1234567890L == 3456789012345L
1234567890L > 3456789012345L
1234567890L < 3456789012345L
-
+
1234567890L < 3456789012345L
1234567890L > 3456789012345L
1234567890L == 3456789012345L
1234567890L > 3456789012345L
1234567890L < 3456789012345L
-
+
1234567890L < 3456789012345L
1234567890L > 3456789012345L
1234567890L == 3456789012345L
1234567890L > 3456789012345L
1234567890L < 3456789012345L
-
+
1234567890L < 3456789012345L
1234567890L > 3456789012345L
1234567890L == 3456789012345L
1234567890L > 3456789012345L
1234567890L < 3456789012345L
-
+
1234567890L < 3456789012345L
1234567890L > 3456789012345L
1234567890L == 3456789012345L
1234567890L > 3456789012345L
1234567890L < 3456789012345L
-
+
1234567890L < 3456789012345L
1234567890L > 3456789012345L
1234567890L == 3456789012345L
1234567890L > 3456789012345L
1234567890L < 3456789012345L
-
+
1234567890L < 3456789012345L
1234567890L > 3456789012345L
1234567890L == 3456789012345L
1234567890L > 3456789012345L
1234567890L < 3456789012345L
-
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
+ 1234567890L < 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L == 3456789012345L
+ 1234567890L > 3456789012345L
+ 1234567890L < 3456789012345L
+
1234567890L < 3456789012345L
1234567890L > 3456789012345L
1234567890L == 3456789012345L
diff --git a/Tools/pybench/Strings.py b/Tools/pybench/Strings.py
index 5ab458e..b01843a 100644
--- a/Tools/pybench/Strings.py
+++ b/Tools/pybench/Strings.py
@@ -81,7 +81,7 @@
for i in xrange(self.rounds):
pass
-
+
class CompareStrings(Test):
@@ -163,7 +163,7 @@
for i in xrange(self.rounds):
pass
-
+
class CompareInternedStrings(Test):
@@ -245,7 +245,7 @@
for i in xrange(self.rounds):
pass
-
+
class CreateStringsWithConcat(Test):
@@ -320,7 +320,7 @@
for i in xrange(self.rounds):
pass
-
+
class StringSlicing(Test):
@@ -334,45 +334,45 @@
for i in xrange(self.rounds):
- s[50:]
- s[:25]
- s[50:55]
- s[-1:]
- s[:1]
- s[2:]
- s[11:-11]
+ s[50:]
+ s[:25]
+ s[50:55]
+ s[-1:]
+ s[:1]
+ s[2:]
+ s[11:-11]
- s[50:]
- s[:25]
- s[50:55]
- s[-1:]
- s[:1]
- s[2:]
- s[11:-11]
+ s[50:]
+ s[:25]
+ s[50:55]
+ s[-1:]
+ s[:1]
+ s[2:]
+ s[11:-11]
- s[50:]
- s[:25]
- s[50:55]
- s[-1:]
- s[:1]
- s[2:]
- s[11:-11]
+ s[50:]
+ s[:25]
+ s[50:55]
+ s[-1:]
+ s[:1]
+ s[2:]
+ s[11:-11]
- s[50:]
- s[:25]
- s[50:55]
- s[-1:]
- s[:1]
- s[2:]
- s[11:-11]
+ s[50:]
+ s[:25]
+ s[50:55]
+ s[-1:]
+ s[:1]
+ s[2:]
+ s[11:-11]
- s[50:]
- s[:25]
- s[50:55]
- s[-1:]
- s[:1]
- s[2:]
- s[11:-11]
+ s[50:]
+ s[:25]
+ s[50:55]
+ s[-1:]
+ s[:1]
+ s[2:]
+ s[11:-11]
def calibrate(self):
@@ -560,5 +560,3 @@
for i in xrange(self.rounds):
s = data[i % len_data]
-
-
diff --git a/Tools/pybench/Tuples.py b/Tools/pybench/Tuples.py
index 7854def..e84ea53 100644
--- a/Tools/pybench/Tuples.py
+++ b/Tools/pybench/Tuples.py
@@ -265,7 +265,7 @@
t = tuple(range(100))
for j in r:
-
+
pass
class SmallTuples(Test):
@@ -362,4 +362,3 @@
for i in xrange(self.rounds):
pass
-
diff --git a/Tools/pybench/Unicode.py b/Tools/pybench/Unicode.py
index 855fcf2..366f171 100644
--- a/Tools/pybench/Unicode.py
+++ b/Tools/pybench/Unicode.py
@@ -86,7 +86,7 @@
for i in xrange(self.rounds):
pass
-
+
class CompareUnicode(Test):
@@ -168,7 +168,7 @@
for i in xrange(self.rounds):
pass
-
+
class CreateUnicodeWithConcat(Test):
@@ -243,7 +243,7 @@
for i in xrange(self.rounds):
pass
-
+
class UnicodeSlicing(Test):
@@ -303,7 +303,7 @@
for i in xrange(self.rounds):
pass
-
+
### String methods
class UnicodeMappings(Test):
@@ -318,7 +318,7 @@
t = join(map(unichr,range(100)),'')
u = join(map(unichr,range(500)),'')
v = join(map(unichr,range(1000)),'')
-
+
for i in xrange(self.rounds):
s.lower()
@@ -375,7 +375,7 @@
t = join(map(unichr,range(100)),'')
u = join(map(unichr,range(500)),'')
v = join(map(unichr,range(1000)),'')
-
+
for i in xrange(self.rounds):
pass
@@ -389,7 +389,7 @@
data = (u'abc', u'123', u' ', u'\u1234\u2345\u3456', u'\uFFFF'*10)
len_data = len(data)
-
+
for i in xrange(self.rounds):
s = data[i % len_data]
@@ -447,7 +447,7 @@
data = (u'abc', u'123', u' ', u'\u1234\u2345\u3456', u'\uFFFF'*10)
len_data = len(data)
-
+
for i in xrange(self.rounds):
s = data[i % len_data]
diff --git a/Tools/pybench/pybench.py b/Tools/pybench/pybench.py
index 6f10bd1..b20c3f3 100755
--- a/Tools/pybench/pybench.py
+++ b/Tools/pybench/pybench.py
@@ -38,7 +38,7 @@
__version__ = '1.3'
#
-# NOTE: Use xrange for all test loops unless you want to face
+# NOTE: Use xrange for all test loops unless you want to face
# a 20MB process !
#
# All tests should have rounds set to values so that a run()
@@ -85,7 +85,7 @@
# for comparisons of benchmark runs - tests with unequal version
# number will not get compared.
version = 1.0
-
+
# The number of abstract operations done in each round of the
# test. An operation is the basic unit of what you want to
# measure. The benchmark will output the amount of run-time per
@@ -129,7 +129,7 @@
""" Run the test in two phases: first calibrate, then
do the actual test. Be careful to keep the calibration
timing low w/r to the test timing.
-
+
"""
test = self.test
calibrate = self.calibrate
@@ -144,7 +144,7 @@
offset = offset + t
offset = offset / cruns
# now the real thing
- t = clock()
+ t = clock()
test()
t = clock() - t
self.last_timing = (t-offset,t,offset)
@@ -152,32 +152,32 @@
def calibrate(self):
- """ Calibrate the test.
+ """ Calibrate the test.
- This method should execute everything that is needed to
- setup and run the test - except for the actual operations
- that you intend to measure. pybench uses this method to
- measure the test implementation overhead.
+ This method should execute everything that is needed to
+ setup and run the test - except for the actual operations
+ that you intend to measure. pybench uses this method to
+ measure the test implementation overhead.
"""
return
def test(self):
- """ Run the test.
+ """ Run the test.
- The test needs to run self.rounds executing
- self.operations number of operations each.
+ The test needs to run self.rounds executing
+ self.operations number of operations each.
"""
# do some tests
return
-
+
def stat(self):
""" Returns two value: average time per run and average per
operation.
-
+
"""
runs = len(self.times)
if runs == 0:
@@ -210,7 +210,7 @@
roundtime = 0 # Average round time
version = None # Benchmark version number (see __init__)
# as float x.yy
- starttime = None # Benchmark start time
+ starttime = None # Benchmark start time
def __init__(self):
@@ -254,7 +254,7 @@
print
self.roundtime = (clock() - roundtime) / self.rounds
print
-
+
def print_stat(self, compare_to=None, hidenoise=0):
if not compare_to:
@@ -380,7 +380,7 @@
hidenoise = self.values['-d']
warp = self.values['-w']
nogc = self.values['--no-gc']
-
+
# Switch off GC
if nogc:
try:
@@ -407,7 +407,7 @@
compare_to = bench
except IOError:
print '* Error opening/reading file',compare_to
- compare_to = None
+ compare_to = None
if show_bench:
try: