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.
........
................
diff --git a/Tools/pybench/Unicode.py b/Tools/pybench/Unicode.py
index 21e24c0..b17a7c3 100644
--- a/Tools/pybench/Unicode.py
+++ b/Tools/pybench/Unicode.py
@@ -4,7 +4,6 @@
raise ImportError
from pybench import Test
-from string import join
class ConcatUnicode(Test):
@@ -15,8 +14,8 @@
def test(self):
# Make sure the strings are *not* interned
- s = unicode(join(map(str,range(100))))
- t = unicode(join(map(str,range(1,101))))
+ s = unicode(u''.join(map(str,range(100))))
+ t = unicode(u''.join(map(str,range(1,101))))
for i in range(self.rounds):
t + s
@@ -81,8 +80,8 @@
def calibrate(self):
- s = unicode(join(map(str,range(100))))
- t = unicode(join(map(str,range(1,101))))
+ s = unicode(u''.join(map(str,range(100))))
+ t = unicode(u''.join(map(str,range(1,101))))
for i in range(self.rounds):
pass
@@ -97,8 +96,8 @@
def test(self):
# Make sure the strings are *not* interned
- s = unicode(join(map(str,range(10))))
- t = unicode(join(map(str,range(10))) + "abc")
+ s = unicode(u''.join(map(str,range(10))))
+ t = unicode(u''.join(map(str,range(10))) + "abc")
for i in range(self.rounds):
t < s
@@ -163,8 +162,8 @@
def calibrate(self):
- s = unicode(join(map(str,range(10))))
- t = unicode(join(map(str,range(10))) + "abc")
+ s = unicode(u''.join(map(str,range(10))))
+ t = unicode(u''.join(map(str,range(10))) + "abc")
for i in range(self.rounds):
pass
@@ -253,7 +252,7 @@
def test(self):
- s = unicode(join(map(str,range(100))))
+ s = unicode(u''.join(map(str,range(100))))
for i in range(self.rounds):
@@ -299,7 +298,7 @@
def calibrate(self):
- s = unicode(join(map(str,range(100))))
+ s = unicode(u''.join(map(str,range(100))))
for i in range(self.rounds):
pass
@@ -314,10 +313,10 @@
def test(self):
- s = join(map(unichr,range(20)),'')
- t = join(map(unichr,range(100)),'')
- u = join(map(unichr,range(500)),'')
- v = join(map(unichr,range(1000)),'')
+ s = u''.join(map(unichr,range(20)))
+ t = u''.join(map(unichr,range(100)))
+ u = u''.join(map(unichr,range(500)))
+ v = u''.join(map(unichr,range(1000)))
for i in range(self.rounds):
@@ -371,10 +370,10 @@
def calibrate(self):
- s = join(map(unichr,range(20)),'')
- t = join(map(unichr,range(100)),'')
- u = join(map(unichr,range(500)),'')
- v = join(map(unichr,range(1000)),'')
+ s = u''.join(map(unichr,range(20)))
+ t = u''.join(map(unichr,range(100)))
+ u = u''.join(map(unichr,range(500)))
+ v = u''.join(map(unichr,range(1000)))
for i in range(self.rounds):
pass