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/Lib/test/string_tests.py b/Lib/test/string_tests.py
index f169fde..b1b64a8 100644
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@ -112,9 +112,9 @@
digits = 7
base = len(charset)
teststrings = set()
- for i in xrange(base ** digits):
+ for i in range(base ** digits):
entry = []
- for j in xrange(digits):
+ for j in range(digits):
i, m = divmod(i, base)
entry.append(charset[m])
teststrings.add(''.join(entry))
@@ -151,9 +151,9 @@
digits = 5
base = len(charset)
teststrings = set()
- for i in xrange(base ** digits):
+ for i in range(base ** digits):
entry = []
- for j in xrange(digits):
+ for j in range(digits):
i, m = divmod(i, base)
entry.append(charset[m])
teststrings.add(''.join(entry))
@@ -1006,10 +1006,10 @@
def test_floatformatting(self):
# float formatting
- for prec in xrange(100):
+ for prec in range(100):
format = '%%.%if' % prec
value = 0.01
- for x in xrange(60):
+ for x in range(60):
value = value * 3.141592655 / 3.0 * 10.0
# The formatfloat() code in stringobject.c and
# unicodeobject.c uses a 120 byte buffer and switches from
@@ -1076,7 +1076,7 @@
def test_maketrans(self):
self.assertEqual(
- ''.join(map(chr, xrange(256))).replace('abc', 'xyz'),
+ ''.join(map(chr, range(256))).replace('abc', 'xyz'),
string.maketrans('abc', 'xyz')
)
self.assertRaises(ValueError, string.maketrans, 'abc', 'xyzw')