mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +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
|
@ -70,7 +70,6 @@ def capture_server(evt, buf):
|
|||
r, w, e = select.select([conn], [], [])
|
||||
if r:
|
||||
data = conn.recv(10)
|
||||
assert isinstance(data, bytes)
|
||||
# keep everything except for the newline terminator
|
||||
buf.write(data.replace(b'\n', b''))
|
||||
if b'\n' in data:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue