Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 14:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove buffer() usage in the socket module by just slicing directly on the

Browse source 
object. This removes all warnings for the module caused by running under -3.
This commit is contained in:
Brett Cannon 2008-08-08 04:27:28 +00:00
parent 03446c43ca
commit 3f92bc6f48
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/socket.py
View file

@ -407,8 +407,8 @@ def readline(self, size=-1):
nl = data.find('\n')
if nl >= 0:
nl += 1
buf.write(buffer(data, 0, nl))
self._rbuf.write(buffer(data, nl))
buf.write(data[:nl])
self._rbuf.write(data[nl:])
del data
break
buf.write(data)
@ -434,9 +434,9 @@ def readline(self, size=-1):
if nl >= 0:
nl += 1
# save the excess data to _rbuf
self._rbuf.write(buffer(data, nl))
self._rbuf.write(data[nl:])
if buf_len:
buf.write(buffer(data, 0, nl))
buf.write(data[:nl])
break
else:
# Shortcut. Avoid data copy through buf when returning
@ -448,8 +448,8 @@ def readline(self, size=-1):
# returning exactly all of our first recv().
return data
if n >= left:
buf.write(buffer(data, 0, left))
self._rbuf.write(buffer(data, left))
buf.write(data[:left])
self._rbuf.write(data[left:])
break
buf.write(data)
buf_len += n