mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 55007-55179 via svnmerge from

Browse source 
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).
........
This commit is contained in:
Guido van Rossum 2007-05-07 22:24:25 +00:00
parent 598d98a7e8
commit 805365ee39
150 changed files with 1412 additions and 1320 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/test/test_descr.py
View file

@ -1181,7 +1181,7 @@ def slots():
return 0
g = G()
orig_objects = len(gc.get_objects())
for i in xrange(10):
for i in range(10):
g==g
new_objects = len(gc.get_objects())
vereq(orig_objects, new_objects)
@ -2363,24 +2363,24 @@ def inherits():
class sublist(list):
pass
a = sublist(range(5))
vereq(a, range(5))
vereq(a, list(range(5)))
a.append("hello")
vereq(a, range(5) + ["hello"])
vereq(a, list(range(5)) + ["hello"])
a[5] = 5
vereq(a, range(6))
vereq(a, list(range(6)))
a.extend(range(6, 20))
vereq(a, range(20))
vereq(a, list(range(20)))
a[-5:] = []
vereq(a, range(15))
vereq(a, list(range(15)))
del a[10:15]
vereq(len(a), 10)
vereq(a, range(10))
vereq(list(a), range(10))
vereq(a, list(range(10)))
vereq(list(a), list(range(10)))
vereq(a[0], 0)
vereq(a[9], 9)
vereq(a[-10], 0)
vereq(a[-1], 9)
vereq(a[:5], range(5))
vereq(a[:5], list(range(5)))
class CountedInput(file):
"""Counts lines read by self.readline().
@ -2412,7 +2412,7 @@ def inherits():
f.writelines(lines)
f.close()
f = CountedInput(TESTFN)
for (i, expected) in zip(range(1, 5) + [4], lines + 2 * [""]):
for (i, expected) in zip(list(range(1, 5)) + [4], lines + 2 * [""]):
got = f.readline()
vereq(expected, got)
vereq(f.lineno, i)
@ -2439,7 +2439,7 @@ def keywords():
vereq(str(object=500), '500')
vereq(str(string='abc', errors='strict'), 'abc')
vereq(tuple(sequence=range(3)), (0, 1, 2))
vereq(list(sequence=(0, 1, 2)), range(3))
vereq(list(sequence=(0, 1, 2)), list(range(3)))
# note: as of Python 2.3, dict() no longer has an "items" keyword arg
for constructor in (int, float, int, complex, str, str,
@ -3502,7 +3502,7 @@ def slottrash():
def __init__(self, x):
self.x = x
o = None
for i in xrange(50000):
for i in range(50000):
o = trash(o)
del o
@ -3959,7 +3959,7 @@ def weakref_segfault():
def wrapper_segfault():
# SF 927248: deeply nested wrappers could cause stack overflow
f = lambda:None
for i in xrange(1000000):
for i in range(1000000):
f = f.__call__
f = None