From 8d53f458dbd8ce33b030d6d1b704fb41ae2c2214 Mon Sep 17 00:00:00 2001 From: Benoit Chesneau Date: Mon, 14 Dec 2009 01:56:36 +0100 Subject: [PATCH] we don't need to handle errors here since they are already handled in worker --- gunicorn/http/iostream.py | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/gunicorn/http/iostream.py b/gunicorn/http/iostream.py index 68ff780f..89db5f9b 100644 --- a/gunicorn/http/iostream.py +++ b/gunicorn/http/iostream.py @@ -25,38 +25,17 @@ class IOStream(object): def __init__(self, sock): self.sock = sock - self.buf = "" - def recv(self, buffer_size): - try: - data = self.sock.recv(buffer_size) - if not data: - # we should handle close here - return '' - return data - except socket.error, e: - if e.args[0] in (errno.ECONNRESET, errno.ENOTCONN, - errno.ESHUTDOWN, errno.ECONNABORTED): - # we should handle close here - return '' - raise - + data = self.sock.recv(buffer_size) + if not data: + # we should handle close here + return '' + return data + def send(self, data): - try: - rst = self.sock.send(data) - return rst - except socket.error, e: - if e.args[0] == EWOULDBLOCK: - return 0 - elif e.args[0] in (errno.ECONNRESET, errno.ENOTCONN, - errno.ESHUTDOWN, errno.ECONNABORTED): - # we should handle close here - - return 0 - else: - raise + return self.sock.send(data) def read_until(self, delimiter): while True: