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_setcomps.py b/Lib/test/test_setcomps.py
index c64e53e..021fd96 100644
--- a/Lib/test/test_setcomps.py
+++ b/Lib/test/test_setcomps.py
@@ -43,23 +43,23 @@
SyntaxError: ...
-Make a nested set comprehension that acts like set(xrange())
+Make a nested set comprehension that acts like set(range())
>>> def srange(n):
- ... return {i for i in xrange(n)}
+ ... return {i for i in range(n)}
>>> list(sorted(srange(10)))
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
Same again, only as a lambda expression instead of a function definition
- >>> lrange = lambda n: {i for i in xrange(n)}
+ >>> lrange = lambda n: {i for i in range(n)}
>>> list(sorted(lrange(10)))
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
Generators can call other generators:
>>> def grange(n):
- ... for x in {i for i in xrange(n)}:
+ ... for x in {i for i in range(n)}:
... yield x
>>> list(sorted(grange(5)))
[0, 1, 2, 3, 4]
@@ -67,7 +67,7 @@
Make sure that None is a valid return value
- >>> {None for i in xrange(10)}
+ >>> {None for i in range(10)}
{None}
########### Tests for various scoping corner cases ############
@@ -141,7 +141,7 @@
if verbose and hasattr(sys, "gettotalrefcount"):
import gc
counts = [None] * 5
- for i in xrange(len(counts)):
+ for i in range(len(counts)):
test_support.run_doctest(test_genexps, verbose)
gc.collect()
counts[i] = sys.gettotalrefcount()
@@ -194,23 +194,23 @@
SyntaxError: ...
-Make a nested set comprehension that acts like set(xrange())
+Make a nested set comprehension that acts like set(range())
>>> def srange(n):
- ... return {i for i in xrange(n)}
+ ... return {i for i in range(n)}
>>> list(sorted(srange(10)))
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
Same again, only as a lambda expression instead of a function definition
- >>> lrange = lambda n: {i for i in xrange(n)}
+ >>> lrange = lambda n: {i for i in range(n)}
>>> list(sorted(lrange(10)))
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
Generators can call other generators:
>>> def grange(n):
- ... for x in {i for i in xrange(n)}:
+ ... for x in {i for i in range(n)}:
... yield x
>>> list(sorted(grange(5)))
[0, 1, 2, 3, 4]
@@ -218,7 +218,7 @@
Make sure that None is a valid return value
- >>> {None for i in xrange(10)}
+ >>> {None for i in range(10)}
{None}
########### Tests for various scoping corner cases ############
@@ -292,7 +292,7 @@
if verbose and hasattr(sys, "gettotalrefcount"):
import gc
counts = [None] * 5
- for i in xrange(len(counts)):
+ for i in range(len(counts)):
test_support.run_doctest(test_genexps, verbose)
gc.collect()
counts[i] = sys.gettotalrefcount()
@@ -345,23 +345,23 @@
SyntaxError: ...
-Make a nested set comprehension that acts like set(xrange())
+Make a nested set comprehension that acts like set(range())
>>> def srange(n):
- ... return {i for i in xrange(n)}
+ ... return {i for i in range(n)}
>>> list(sorted(srange(10)))
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
Same again, only as a lambda expression instead of a function definition
- >>> lrange = lambda n: {i for i in xrange(n)}
+ >>> lrange = lambda n: {i for i in range(n)}
>>> list(sorted(lrange(10)))
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
Generators can call other generators:
>>> def grange(n):
- ... for x in {i for i in xrange(n)}:
+ ... for x in {i for i in range(n)}:
... yield x
>>> list(sorted(grange(5)))
[0, 1, 2, 3, 4]
@@ -369,7 +369,7 @@
Make sure that None is a valid return value
- >>> {None for i in xrange(10)}
+ >>> {None for i in range(10)}
{None}
########### Tests for various scoping corner cases ############
@@ -443,7 +443,7 @@
if verbose and hasattr(sys, "gettotalrefcount"):
import gc
counts = [None] * 5
- for i in xrange(len(counts)):
+ for i in range(len(counts)):
test_support.run_doctest(test_genexps, verbose)
gc.collect()
counts[i] = sys.gettotalrefcount()