From 805365ee39298f93e433e19ae0dd87c6f782145b Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 7 May 2007 22:24:25 +0000 Subject: 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). ........ --- Lib/test/test_struct.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Lib/test/test_struct.py') diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index c3df2226d34..29c555facf9 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -557,18 +557,18 @@ def test_unpack_from(): vereq(s.unpack_from(data), ('abcd',)) vereq(s.unpack_from(data, 2), ('cd01',)) vereq(s.unpack_from(data, 4), ('0123',)) - for i in xrange(6): + for i in range(6): vereq(s.unpack_from(data, i), (data[i:i+4],)) - for i in xrange(6, len(test_string) + 1): + for i in range(6, len(test_string) + 1): simple_err(s.unpack_from, data, i) for cls in (str, buffer): data = cls(test_string) vereq(struct.unpack_from(fmt, data), ('abcd',)) vereq(struct.unpack_from(fmt, data, 2), ('cd01',)) vereq(struct.unpack_from(fmt, data, 4), ('0123',)) - for i in xrange(6): + for i in range(6): vereq(struct.unpack_from(fmt, data, i), (data[i:i+4],)) - for i in xrange(6, len(test_string) + 1): + for i in range(6, len(test_string) + 1): simple_err(struct.unpack_from, fmt, data, i) def test_pack_into(): -- cgit v1.2.3