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/test_long.py b/Lib/test/test_long.py
index 1f65202..c38056d 100644
--- a/Lib/test/test_long.py
+++ b/Lib/test/test_long.py
@@ -71,7 +71,7 @@
def getran2(ndigits):
answer = 0
- for i in xrange(ndigits):
+ for i in range(ndigits):
answer = (answer << SHIFT) | random.randint(0, MASK)
if random.random() < 0.5:
answer = -answer
@@ -92,8 +92,8 @@
self.assert_(y < r <= 0, Frm("bad mod from divmod on %r and %r", x, y))
def test_division(self):
- digits = range(1, MAXDIGITS+1) + range(KARATSUBA_CUTOFF,
- KARATSUBA_CUTOFF + 14)
+ digits = list(range(1, MAXDIGITS+1)) + list(range(KARATSUBA_CUTOFF,
+ KARATSUBA_CUTOFF + 14))
digits.append(KARATSUBA_CUTOFF * 3)
for lenx in digits:
x = self.getran(lenx)
@@ -102,7 +102,8 @@
self.check_division(x, y)
def test_karatsuba(self):
- digits = range(1, 5) + range(KARATSUBA_CUTOFF, KARATSUBA_CUTOFF + 10)
+ digits = list(range(1, 5)) + list(range(KARATSUBA_CUTOFF,
+ KARATSUBA_CUTOFF + 10))
digits.extend([KARATSUBA_CUTOFF * 10, KARATSUBA_CUTOFF * 100])
bits = [digit * SHIFT for digit in digits]
@@ -140,7 +141,7 @@
eq(x ^ ~x, -1, Frm("x ^ ~x != -1 for x=%r", x))
eq(-x, 1 + ~x, Frm("not -x == 1 + ~x for x=%r", x))
eq(-x, ~(x-1), Frm("not -x == ~(x-1) forx =%r", x))
- for n in xrange(2*SHIFT):
+ for n in range(2*SHIFT):
p2 = 2 ** n
eq(x << n >> n, x,
Frm("x << n >> n != x for x=%r, n=%r", (x, n)))
@@ -184,7 +185,7 @@
def test_bitop_identities(self):
for x in special:
self.check_bitop_identities_1(x)
- digits = xrange(1, MAXDIGITS+1)
+ digits = range(1, MAXDIGITS+1)
for lenx in digits:
x = self.getran(lenx)
self.check_bitop_identities_1(x)
@@ -229,8 +230,8 @@
def test_format(self):
for x in special:
self.check_format_1(x)
- for i in xrange(10):
- for lenx in xrange(1, MAXDIGITS+1):
+ for i in range(10):
+ for lenx in range(1, MAXDIGITS+1):
x = self.getran(lenx)
self.check_format_1(x)
@@ -399,7 +400,7 @@
LOG10E = math.log10(math.e)
- for exp in range(10) + [100, 1000, 10000]:
+ for exp in list(range(10)) + [100, 1000, 10000]:
value = 10 ** exp
log10 = math.log10(value)
self.assertAlmostEqual(log10, exp)