mirror of
https://github.com/python/cpython.git
synced 2025-10-17 20:28:43 +00:00
Merged revisions 56020-56124 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56037 | georg.brandl | 2007-06-19 05:33:20 -0700 (Tue, 19 Jun 2007) | 2 lines Patch #1739659: don't slice dict.keys() in pydoc. ................ r56060 | martin.v.loewis | 2007-06-21 13:00:02 -0700 (Thu, 21 Jun 2007) | 2 lines Regenerate to add True, False, None. ................ r56069 | neal.norwitz | 2007-06-21 22:31:56 -0700 (Thu, 21 Jun 2007) | 1 line Get the doctest working again after adding None, True, and False as kewyords. ................ r56070 | neal.norwitz | 2007-06-21 23:25:33 -0700 (Thu, 21 Jun 2007) | 1 line Add space to error message. ................ r56071 | neal.norwitz | 2007-06-21 23:40:04 -0700 (Thu, 21 Jun 2007) | 6 lines Get pybench working, primarily * Use print function * Stop using string module * Use sorted instead of assuming dict methods return lists * Convert range result to a list ................ r56089 | collin.winter | 2007-06-26 10:31:48 -0700 (Tue, 26 Jun 2007) | 1 line Fix AttributeError in distutils/dir_util.py. ................ r56124 | guido.van.rossum | 2007-06-29 18:04:31 -0700 (Fri, 29 Jun 2007) | 30 lines Merged revisions 56014-56123 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56019 | lars.gustaebel | 2007-06-18 04:42:11 -0700 (Mon, 18 Jun 2007) | 2 lines Added exclude keyword argument to the TarFile.add() method. ........ r56023 | lars.gustaebel | 2007-06-18 13:05:55 -0700 (Mon, 18 Jun 2007) | 3 lines Added missing \versionchanged tag for the new exclude parameter. ........ r56038 | georg.brandl | 2007-06-19 05:36:00 -0700 (Tue, 19 Jun 2007) | 2 lines Bug #1737864: allow empty message in logging format routines. ........ r56040 | georg.brandl | 2007-06-19 05:38:20 -0700 (Tue, 19 Jun 2007) | 2 lines Bug #1739115: make shutil.rmtree docs clear wrt. file deletion. ........ r56084 | georg.brandl | 2007-06-25 08:21:23 -0700 (Mon, 25 Jun 2007) | 2 lines Bug #1742901: document None behavior of shlex.split. ........ r56091 | georg.brandl | 2007-06-27 07:09:56 -0700 (Wed, 27 Jun 2007) | 2 lines Fix a variable name in winreg docs. ........ ................
This commit is contained in:
parent
8ddff70822
commit
486364b821
20 changed files with 286 additions and 253 deletions
|
@ -1,5 +1,4 @@
|
|||
from pybench import Test
|
||||
from string import join
|
||||
import sys
|
||||
|
||||
class ConcatStrings(Test):
|
||||
|
@ -11,8 +10,8 @@ class ConcatStrings(Test):
|
|||
def test(self):
|
||||
|
||||
# Make sure the strings are *not* interned
|
||||
s = join(map(str,range(100)))
|
||||
t = join(map(str,range(1,101)))
|
||||
s = ''.join(map(str,range(100)))
|
||||
t = ''.join(map(str,range(1,101)))
|
||||
|
||||
for i in range(self.rounds):
|
||||
t + s
|
||||
|
@ -77,8 +76,8 @@ class ConcatStrings(Test):
|
|||
|
||||
def calibrate(self):
|
||||
|
||||
s = join(map(str,range(100)))
|
||||
t = join(map(str,range(1,101)))
|
||||
s = ''.join(map(str,range(100)))
|
||||
t = ''.join(map(str,range(1,101)))
|
||||
|
||||
for i in range(self.rounds):
|
||||
pass
|
||||
|
@ -93,8 +92,8 @@ class CompareStrings(Test):
|
|||
def test(self):
|
||||
|
||||
# Make sure the strings are *not* interned
|
||||
s = join(map(str,range(10)))
|
||||
t = join(map(str,range(10))) + "abc"
|
||||
s = ''.join(map(str,range(10)))
|
||||
t = ''.join(map(str,range(10))) + "abc"
|
||||
|
||||
for i in range(self.rounds):
|
||||
t < s
|
||||
|
@ -159,8 +158,8 @@ class CompareStrings(Test):
|
|||
|
||||
def calibrate(self):
|
||||
|
||||
s = join(map(str,range(10)))
|
||||
t = join(map(str,range(10))) + "abc"
|
||||
s = ''.join(map(str,range(10)))
|
||||
t = ''.join(map(str,range(10))) + "abc"
|
||||
|
||||
for i in range(self.rounds):
|
||||
pass
|
||||
|
@ -175,7 +174,7 @@ class CompareInternedStrings(Test):
|
|||
def test(self):
|
||||
|
||||
# Make sure the strings *are* interned
|
||||
s = sys.intern(join(map(str,range(10))))
|
||||
s = sys.intern(''.join(map(str,range(10))))
|
||||
t = s
|
||||
|
||||
for i in range(self.rounds):
|
||||
|
@ -241,7 +240,7 @@ class CompareInternedStrings(Test):
|
|||
|
||||
def calibrate(self):
|
||||
|
||||
s = sys.intern(join(map(str,range(10))))
|
||||
s = sys.intern(''.join(map(str,range(10))))
|
||||
t = s
|
||||
|
||||
for i in range(self.rounds):
|
||||
|
@ -331,7 +330,7 @@ class StringSlicing(Test):
|
|||
|
||||
def test(self):
|
||||
|
||||
s = join(map(str,range(100)))
|
||||
s = ''.join(map(str,range(100)))
|
||||
|
||||
for i in range(self.rounds):
|
||||
|
||||
|
@ -377,7 +376,7 @@ class StringSlicing(Test):
|
|||
|
||||
def calibrate(self):
|
||||
|
||||
s = join(map(str,range(100)))
|
||||
s = ''.join(map(str,range(100)))
|
||||
|
||||
for i in range(self.rounds):
|
||||
pass
|
||||
|
@ -394,10 +393,10 @@ if hasattr('', 'lower'):
|
|||
|
||||
def test(self):
|
||||
|
||||
s = join(map(chr,range(20)),'')
|
||||
t = join(map(chr,range(50)),'')
|
||||
u = join(map(chr,range(100)),'')
|
||||
v = join(map(chr,range(256)),'')
|
||||
s = ''.join(map(chr,range(20)))
|
||||
t = ''.join(map(chr,range(50)))
|
||||
u = ''.join(map(chr,range(100)))
|
||||
v = ''.join(map(chr,range(256)))
|
||||
|
||||
for i in range(self.rounds):
|
||||
|
||||
|
@ -451,10 +450,10 @@ if hasattr('', 'lower'):
|
|||
|
||||
def calibrate(self):
|
||||
|
||||
s = join(map(chr,range(20)),'')
|
||||
t = join(map(chr,range(50)),'')
|
||||
u = join(map(chr,range(100)),'')
|
||||
v = join(map(chr,range(256)),'')
|
||||
s = ''.join(map(chr,range(20)))
|
||||
t = ''.join(map(chr,range(50)))
|
||||
u = ''.join(map(chr,range(100)))
|
||||
v = ''.join(map(chr,range(256)))
|
||||
|
||||
for i in range(self.rounds):
|
||||
pass
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue