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_mhlib.py b/Lib/test/test_mhlib.py
index 5c8b40d..f425cb9 100644
--- a/Lib/test/test_mhlib.py
+++ b/Lib/test/test_mhlib.py
@@ -121,7 +121,7 @@
'Date': '29 July 2001'}, "Hullo, Mrs. Premise!\n")
# A folder with many messages
- for i in range(5, 101)+range(101, 201, 2):
+ for i in list(range(5, 101))+list(range(101, 201, 2)):
writeMessage('wide', i,
{'From': 'nowhere', 'Subject': 'message #%s' % i},
"This is message number %s\n" % i)
@@ -203,7 +203,7 @@
f = mh.openfolder('wide')
all = f.listmessages()
- eq(all, range(5, 101)+range(101, 201, 2))
+ eq(all, list(range(5, 101))+list(range(101, 201, 2)))
eq(f.getcurrent(), 55)
f.setcurrent(99)
eq(readFile(os.path.join(_mhpath, 'wide', '.mh_sequences')),
@@ -212,21 +212,21 @@
def seqeq(seq, val):
eq(f.parsesequence(seq), val)
- seqeq('5-55', range(5, 56))
- seqeq('90-108', range(90, 101)+range(101, 109, 2))
- seqeq('90-108', range(90, 101)+range(101, 109, 2))
+ seqeq('5-55', list(range(5, 56)))
+ seqeq('90-108', list(range(90, 101))+list(range(101, 109, 2)))
+ seqeq('90-108', list(range(90, 101))+list(range(101, 109, 2)))
- seqeq('10:10', range(10, 20))
- seqeq('10:+10', range(10, 20))
- seqeq('101:10', range(101, 121, 2))
+ seqeq('10:10', list(range(10, 20)))
+ seqeq('10:+10', list(range(10, 20)))
+ seqeq('101:10', list(range(101, 121, 2)))
seqeq('cur', [99])
seqeq('.', [99])
seqeq('prev', [98])
seqeq('next', [100])
seqeq('cur:-3', [97, 98, 99])
- seqeq('first-cur', range(5, 100))
- seqeq('150-last', range(151, 201, 2))
+ seqeq('first-cur', list(range(5, 100)))
+ seqeq('150-last', list(range(151, 201, 2)))
seqeq('prev-next', [98, 99, 100])
lowprimes = [5, 7, 11, 13, 17, 19, 23, 29]