From 7922bc290d2304b4199233195796716b64e7d021 Mon Sep 17 00:00:00 2001
From: Denis Bilenko <denis@ag-projects.com>
Date: Mon, 12 Jan 2009 19:29:38 +0600
Subject: [PATCH] made twistedutil.protocol 2.4 compatible

---
 eventlet/twistedutil/protocol.py | 38 +++++++++++++++++---------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/eventlet/twistedutil/protocol.py b/eventlet/twistedutil/protocol.py
index aa89a7a..bf8fd1f 100644
--- a/eventlet/twistedutil/protocol.py
+++ b/eventlet/twistedutil/protocol.py
@@ -186,16 +186,17 @@ class GreenTransport(GreenTransportBase):
         if self._queue is not None:
             resumed = False
             try:
-                while len(self._buffer) < size or size < 0:
-                    if not resumed:
-                        self.resumeProducing()
-                        resumed = True
-                    self._buffer += self._wait()
-            except ConnectionDone:
-                self._queue = None
-            except:
-                self._queue = None
-                self._error = sys.exc_info()
+                try:
+                    while len(self._buffer) < size or size < 0:
+                        if not resumed:
+                            self.resumeProducing()
+                            resumed = True
+                        self._buffer += self._wait()
+                except ConnectionDone:
+                    self._queue = None
+                except:
+                    self._queue = None
+                    self._error = sys.exc_info()
             finally:
                 if resumed:
                     self.pauseProducing()
@@ -213,14 +214,15 @@ class GreenTransport(GreenTransportBase):
         if self._queue is not None and not self._buffer:
             self.resumeProducing()
             try:
-                recvd = self._wait()
-                #print 'received %r' % recvd
-                self._buffer += recvd
-            except ConnectionDone:
-                self._queue = None
-            except:
-                self._queue = None
-                self._error = sys.exc_info()
+                try:
+                    recvd = self._wait()
+                    #print 'received %r' % recvd
+                    self._buffer += recvd
+                except ConnectionDone:
+                    self._queue = None
+                except:
+                    self._queue = None
+                    self._error = sys.exc_info()
             finally:
                 self.pauseProducing()
         if buflen is None: