From 3f92bc6f4811241ac68ec2681895d22ba8c68bf0 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 8 Aug 2008 04:27:28 +0000 Subject: Remove buffer() usage in the socket module by just slicing directly on the object. This removes all warnings for the module caused by running under -3. --- Lib/socket.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Lib/socket.py') diff --git a/Lib/socket.py b/Lib/socket.py index 6dcd1a693a..24ef3af3ff 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -407,8 +407,8 @@ class _fileobject(object): 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 @@ class _fileobject(object): 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 @@ class _fileobject(object): # 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 -- cgit v1.2.1