openstack/deb-python-websocket-client
Code Issues Proposed changes

_abnf, _socket: Don't override builtins

Browse Source
This commit is contained in:
Allan Lewis
2016-04-27 11:28:41 +01:00
parent 669096e874
commit 17cfffbff1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
websocket/_abnf.py
View File

@@ -344,9 +344,9 @@ class frame_buffer(object):
# reads is limited by socket buffer and is relatively small, # reads is limited by socket buffer and is relatively small,
# yet passing large numbers repeatedly causes lots of large # yet passing large numbers repeatedly causes lots of large
# buffers allocated and then shrunk, which results in fragmentation. # buffers allocated and then shrunk, which results in fragmentation.
bytes = self.recv(min(16384, shortage)) bytes_ = self.recv(min(16384, shortage))
self.recv_buffer.append(bytes) self.recv_buffer.append(bytes_)
shortage -= len(bytes) shortage -= len(bytes_)
unified = six.b("").join(self.recv_buffer) unified = six.b("").join(self.recv_buffer)

6
websocket/_socket.py
View File

@@ -74,7 +74,7 @@ def recv(sock, bufsize):
raise WebSocketConnectionClosedException("socket is already closed.") raise WebSocketConnectionClosedException("socket is already closed.")
try: try:
bytes = sock.recv(bufsize) bytes_ = sock.recv(bufsize)
except socket.timeout as e: except socket.timeout as e:
message = extract_err_message(e) message = extract_err_message(e)
raise WebSocketTimeoutException(message) raise WebSocketTimeoutException(message)
@@ -85,10 +85,10 @@ def recv(sock, bufsize):
else: else:
raise raise
if not bytes: if not bytes_:
raise WebSocketConnectionClosedException("Connection is already closed.") raise WebSocketConnectionClosedException("Connection is already closed.")
return bytes return bytes_
def recv_line(sock): def recv_line(sock):