mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
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). ........
This commit is contained in:
parent
598d98a7e8
commit
805365ee39
150 changed files with 1412 additions and 1320 deletions
|
@ -90,7 +90,7 @@ class UnicodeTest(
|
|||
"\\xe2\\xe3\\xe4\\xe5\\xe6\\xe7\\xe8\\xe9\\xea\\xeb\\xec\\xed\\xee\\xef"
|
||||
"\\xf0\\xf1\\xf2\\xf3\\xf4\\xf5\\xf6\\xf7\\xf8\\xf9\\xfa\\xfb\\xfc\\xfd"
|
||||
"\\xfe\\xff'")
|
||||
testrepr = repr(''.join(map(chr, xrange(256))))
|
||||
testrepr = repr(''.join(map(chr, range(256))))
|
||||
self.assertEqual(testrepr, latin1repr)
|
||||
# Test repr works on wide unicode escapes without overflow.
|
||||
self.assertEqual(repr("\U00010000" * 39 + "\uffff" * 4096),
|
||||
|
@ -592,7 +592,7 @@ class UnicodeTest(
|
|||
self.assertEqual('hello'.encode('latin-1'), b'hello')
|
||||
|
||||
# Roundtrip safety for BMP (just the first 1024 chars)
|
||||
for c in xrange(1024):
|
||||
for c in range(1024):
|
||||
u = chr(c)
|
||||
for encoding in ('utf-7', 'utf-8', 'utf-16', 'utf-16-le',
|
||||
'utf-16-be', 'raw_unicode_escape',
|
||||
|
@ -600,13 +600,13 @@ class UnicodeTest(
|
|||
self.assertEqual(str(u.encode(encoding),encoding), u)
|
||||
|
||||
# Roundtrip safety for BMP (just the first 256 chars)
|
||||
for c in xrange(256):
|
||||
for c in range(256):
|
||||
u = chr(c)
|
||||
for encoding in ('latin-1',):
|
||||
self.assertEqual(str(u.encode(encoding),encoding), u)
|
||||
|
||||
# Roundtrip safety for BMP (just the first 128 chars)
|
||||
for c in xrange(128):
|
||||
for c in range(128):
|
||||
u = chr(c)
|
||||
for encoding in ('ascii',):
|
||||
self.assertEqual(str(u.encode(encoding),encoding), u)
|
||||
|
@ -622,13 +622,14 @@ class UnicodeTest(
|
|||
# This excludes surrogates: in the full range, there would be
|
||||
# a surrogate pair (\udbff\udc00), which gets converted back
|
||||
# to a non-BMP character (\U0010fc00)
|
||||
u = ''.join(map(chr, range(0,0xd800)+range(0xe000,0x10000)))
|
||||
u = u''.join(map(chr, list(range(0,0xd800)) +
|
||||
list(range(0xe000,0x10000))))
|
||||
for encoding in ('utf-8',):
|
||||
self.assertEqual(str(u.encode(encoding),encoding), u)
|
||||
|
||||
def test_codecs_charmap(self):
|
||||
# 0-127
|
||||
s = bytes(xrange(128))
|
||||
s = bytes(range(128))
|
||||
for encoding in (
|
||||
'cp037', 'cp1026',
|
||||
'cp437', 'cp500', 'cp737', 'cp775', 'cp850',
|
||||
|
@ -656,7 +657,7 @@ class UnicodeTest(
|
|||
self.assertEqual(str(s, encoding).encode(encoding), s)
|
||||
|
||||
# 128-255
|
||||
s = bytes(xrange(128, 256))
|
||||
s = bytes(range(128, 256))
|
||||
for encoding in (
|
||||
'cp037', 'cp1026',
|
||||
'cp437', 'cp500', 'cp737', 'cp775', 'cp850',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue