mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Merging the py3k-pep3137 branch back into the py3k branch.
No detailed change log; just check out the change log for the py3k-pep3137 branch. The most obvious changes: - str8 renamed to bytes (PyString at the C level); - bytes renamed to buffer (PyBytes at the C level); - PyString and PyUnicode are no longer compatible. I.e. we now have an immutable bytes type and a mutable bytes type. The behavior of PyString was modified quite a bit, to make it more bytes-like. Some changes are still on the to-do list.
This commit is contained in:
parent
a19f80c6df
commit
98297ee781
148 changed files with 2533 additions and 3517 deletions
|
@ -39,15 +39,15 @@ class MmapTests(unittest.TestCase):
|
|||
|
||||
self.assertEqual(len(m), 2*PAGESIZE)
|
||||
|
||||
self.assertEqual(m[0], b'\0')
|
||||
self.assertEqual(m[0], 0)
|
||||
self.assertEqual(m[0:3], b'\0\0\0')
|
||||
|
||||
# Modify the file's content
|
||||
m[0] = b'3'
|
||||
m[0] = b'3'[0]
|
||||
m[PAGESIZE +3: PAGESIZE +3+3] = b'bar'
|
||||
|
||||
# Check that the modification worked
|
||||
self.assertEqual(m[0], b'3')
|
||||
self.assertEqual(m[0], b'3'[0])
|
||||
self.assertEqual(m[0:3], b'3\0\0')
|
||||
self.assertEqual(m[PAGESIZE-1 : PAGESIZE + 7], b'\0foobar\0')
|
||||
|
||||
|
@ -297,11 +297,11 @@ class MmapTests(unittest.TestCase):
|
|||
# anonymous mmap.mmap(-1, PAGE)
|
||||
m = mmap.mmap(-1, PAGESIZE)
|
||||
for x in range(PAGESIZE):
|
||||
self.assertEqual(m[x], b'\0', "anonymously mmap'ed contents should be zero")
|
||||
self.assertEqual(m[x], 0,
|
||||
"anonymously mmap'ed contents should be zero")
|
||||
|
||||
b = bytes(1)
|
||||
for x in range(PAGESIZE):
|
||||
b[0] = x & 255
|
||||
b = x & 0xff
|
||||
m[x] = b
|
||||
self.assertEqual(m[x], b)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue