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_xrange.py b/Lib/test/test_xrange.py
index 5225250..1e7f9de 100644
--- a/Lib/test/test_xrange.py
+++ b/Lib/test/test_xrange.py
@@ -9,56 +9,52 @@
class XrangeTest(unittest.TestCase):
def test_xrange(self):
- self.assertEqual(list(xrange(3)), [0, 1, 2])
- self.assertEqual(list(xrange(1, 5)), [1, 2, 3, 4])
- self.assertEqual(list(xrange(0)), [])
- self.assertEqual(list(xrange(-3)), [])
- self.assertEqual(list(xrange(1, 10, 3)), [1, 4, 7])
- self.assertEqual(list(xrange(5, -5, -3)), [5, 2, -1, -4])
+ self.assertEqual(list(range(3)), [0, 1, 2])
+ self.assertEqual(list(range(1, 5)), [1, 2, 3, 4])
+ self.assertEqual(list(range(0)), [])
+ self.assertEqual(list(range(-3)), [])
+ self.assertEqual(list(range(1, 10, 3)), [1, 4, 7])
+ self.assertEqual(list(range(5, -5, -3)), [5, 2, -1, -4])
a = 10
b = 100
c = 50
- self.assertEqual(list(xrange(a, a+2)), [a, a+1])
- self.assertEqual(list(xrange(a+2, a, -1)), [a+2, a+1])
- self.assertEqual(list(xrange(a+4, a, -2)), [a+4, a+2])
+ self.assertEqual(list(range(a, a+2)), [a, a+1])
+ self.assertEqual(list(range(a+2, a, -1)), [a+2, a+1])
+ self.assertEqual(list(range(a+4, a, -2)), [a+4, a+2])
- seq = list(xrange(a, b, c))
+ seq = list(range(a, b, c))
self.assert_(a in seq)
self.assert_(b not in seq)
self.assertEqual(len(seq), 2)
- seq = list(xrange(b, a, -c))
+ seq = list(range(b, a, -c))
self.assert_(b in seq)
self.assert_(a not in seq)
self.assertEqual(len(seq), 2)
- seq = list(xrange(-a, -b, -c))
+ seq = list(range(-a, -b, -c))
self.assert_(-a in seq)
self.assert_(-b not in seq)
self.assertEqual(len(seq), 2)
- self.assertRaises(TypeError, xrange)
- self.assertRaises(TypeError, xrange, 1, 2, 3, 4)
- self.assertRaises(ValueError, xrange, 1, 2, 0)
+ self.assertRaises(TypeError, range)
+ self.assertRaises(TypeError, range, 1, 2, 3, 4)
+ self.assertRaises(ValueError, range, 1, 2, 0)
- self.assertRaises(TypeError, xrange, 0.0, 2, 1)
- self.assertRaises(TypeError, xrange, 1, 2.0, 1)
- self.assertRaises(TypeError, xrange, 1, 2, 1.0)
- self.assertRaises(TypeError, xrange, 1e100, 1e101, 1e101)
+ self.assertRaises(TypeError, range, 0.0, 2, 1)
+ self.assertRaises(TypeError, range, 1, 2.0, 1)
+ self.assertRaises(TypeError, range, 1, 2, 1.0)
+ self.assertRaises(TypeError, range, 1e100, 1e101, 1e101)
- self.assertRaises(TypeError, xrange, 0, "spam")
- self.assertRaises(TypeError, xrange, 0, 42, "spam")
+ self.assertRaises(TypeError, range, 0, "spam")
+ self.assertRaises(TypeError, range, 0, 42, "spam")
- self.assertEqual(len(xrange(0, sys.maxint, sys.maxint-1)), 2)
+ self.assertEqual(len(range(0, sys.maxint, sys.maxint-1)), 2)
- self.assertRaises(OverflowError, xrange, -sys.maxint, sys.maxint)
- self.assertRaises(OverflowError, xrange, 0, 2*sys.maxint)
-
- r = xrange(-sys.maxint, sys.maxint, 2)
+ r = range(-sys.maxint, sys.maxint, 2)
self.assertEqual(len(r), sys.maxint)
- self.assertRaises(OverflowError, xrange, -sys.maxint-1, sys.maxint, 2)
def test_main():
test.test_support.run_unittest(XrangeTest)