Merged revisions 55007-55179 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55077 | guido.van.rossum | 2007-05-02 11:54:37 -0700 (Wed, 02 May 2007) | 2 lines
Use the new print syntax, at least.
........
r55142 | fred.drake | 2007-05-04 21:27:30 -0700 (Fri, 04 May 2007) | 1 line
remove old cruftiness
........
r55143 | fred.drake | 2007-05-04 21:52:16 -0700 (Fri, 04 May 2007) | 1 line
make this work with the new Python
........
r55162 | neal.norwitz | 2007-05-06 22:29:18 -0700 (Sun, 06 May 2007) | 1 line
Get asdl code gen working with Python 2.3. Should continue to work with 3.0
........
r55164 | neal.norwitz | 2007-05-07 00:00:38 -0700 (Mon, 07 May 2007) | 1 line
Verify checkins to p3yk (sic) branch go to 3000 list.
........
r55166 | neal.norwitz | 2007-05-07 00:12:35 -0700 (Mon, 07 May 2007) | 1 line
Fix this test so it runs again by importing warnings_test properly.
........
r55167 | neal.norwitz | 2007-05-07 01:03:22 -0700 (Mon, 07 May 2007) | 8 lines
So long xrange. range() now supports values that are outside
-sys.maxint to sys.maxint. floats raise a TypeError.
This has been sitting for a long time. It probably has some problems and
needs cleanup. Objects/rangeobject.c now uses 4-space indents since
it is almost completely new.
........
r55171 | guido.van.rossum | 2007-05-07 10:21:26 -0700 (Mon, 07 May 2007) | 4 lines
Fix two tests that were previously depending on significant spaces
at the end of a line (and before that on Python 2.x print behavior
that has no exact equivalent in 3.0).
........
diff --git a/Tools/pybench/Unicode.py b/Tools/pybench/Unicode.py
index 153a91e..21e24c0 100644
--- a/Tools/pybench/Unicode.py
+++ b/Tools/pybench/Unicode.py
@@ -18,7 +18,7 @@
s = unicode(join(map(str,range(100))))
t = unicode(join(map(str,range(1,101))))
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
t + s
t + s
t + s
@@ -84,7 +84,7 @@
s = unicode(join(map(str,range(100))))
t = unicode(join(map(str,range(1,101))))
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
pass
@@ -100,7 +100,7 @@
s = unicode(join(map(str,range(10))))
t = unicode(join(map(str,range(10))) + "abc")
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
t < s
t > s
t == s
@@ -166,7 +166,7 @@
s = unicode(join(map(str,range(10))))
t = unicode(join(map(str,range(10))) + "abc")
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
pass
@@ -178,7 +178,7 @@
def test(self):
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
s = u'om'
s = s + u'xbx'
s = s + u'xcx'
@@ -241,7 +241,7 @@
def calibrate(self):
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
pass
@@ -255,7 +255,7 @@
s = unicode(join(map(str,range(100))))
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
s[50:]
s[:25]
@@ -301,7 +301,7 @@
s = unicode(join(map(str,range(100))))
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
pass
### String methods
@@ -319,7 +319,7 @@
u = join(map(unichr,range(500)),'')
v = join(map(unichr,range(1000)),'')
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
s.lower()
s.lower()
@@ -376,7 +376,7 @@
u = join(map(unichr,range(500)),'')
v = join(map(unichr,range(1000)),'')
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
pass
class UnicodePredicates(Test):
@@ -390,7 +390,7 @@
data = (u'abc', u'123', u' ', u'\u1234\u2345\u3456', u'\uFFFF'*10)
len_data = len(data)
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
s = data[i % len_data]
s.isalnum()
@@ -448,7 +448,7 @@
data = (u'abc', u'123', u' ', u'\u1234\u2345\u3456', u'\uFFFF'*10)
len_data = len(data)
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
s = data[i % len_data]
try:
@@ -475,7 +475,7 @@
mirrored = unicodedata.mirrored
combining = unicodedata.combining
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
c = data[i % len_data]
@@ -537,6 +537,6 @@
mirrored = unicodedata.mirrored
combining = unicodedata.combining
- for i in xrange(self.rounds):
+ for i in range(self.rounds):
c = data[i % len_data]