From 625624b0a776428321ddb09c57f0d638fbd50385 Mon Sep 17 00:00:00 2001
From: Sergey Shepelev <temotor@gmail.com>
Date: Wed, 2 Oct 2013 16:04:34 +0400
Subject: [PATCH] tpool: proxy __enter__, __exit__ fixes BB-158; Thanks to Eric
 Urban

https://bitbucket.org/eventlet/eventlet/issue/158/eventlet-pooled-psycopg2-connections-wont
---
 eventlet/tpool.py     | 16 ++++++++++------
 tests/db_pool_test.py | 19 ++++++++++++++++---
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/eventlet/tpool.py b/eventlet/tpool.py
index 103f79e..08337b7 100644
--- a/eventlet/tpool.py
+++ b/eventlet/tpool.py
@@ -168,11 +168,10 @@ class Proxy(object):
         self._autowrap = autowrap
         self._autowrap_names = autowrap_names
 
-    def __getattr__(self,attr_name):
-        f = getattr(self._obj,attr_name)
+    def __getattr__(self, attr_name):
+        f = getattr(self._obj, attr_name)
         if not hasattr(f, '__call__'):
-            if (isinstance(f, self._autowrap) or
-                attr_name in self._autowrap_names):
+            if isinstance(f, self._autowrap) or attr_name in self._autowrap_names:
                 return Proxy(f, self._autowrap)
             return f
         def doit(*args, **kwargs):
@@ -186,7 +185,7 @@ class Proxy(object):
     # doesn't use getattr to retrieve and therefore have to be defined
     # explicitly
     def __getitem__(self, key):
-        return proxy_call(self._autowrap, self._obj.__getitem__, key)    
+        return proxy_call(self._autowrap, self._obj.__getitem__, key)
     def __setitem__(self, key, value):
         return proxy_call(self._autowrap, self._obj.__setitem__, key, value)
     def __deepcopy__(self, memo=None):
@@ -198,6 +197,11 @@ class Proxy(object):
             return Proxy(proxy_call(self._autowrap, self._obj, *a, **kw))
         else:
             return proxy_call(self._autowrap, self._obj, *a, **kw)
+    def __enter__(self):
+        return proxy_call(self._autowrap, self._obj.__enter__)
+    def __exit__(self, *exc):
+        return proxy_call(self._autowrap, self._obj.__exit__, *exc)
+
     # these don't go through a proxy call, because they're likely to
     # be called often, and are unlikely to be implemented on the
     # wrapped object in such a way that they would block
@@ -260,7 +264,7 @@ def setup():
             execute in main thread.  Check the value of the environment \
             variable EVENTLET_THREADPOOL_SIZE.", RuntimeWarning)
     for i in xrange(_nthreads):
-        t = threading.Thread(target=tworker, 
+        t = threading.Thread(target=tworker,
                              name="tpool_thread_%s" % i)
         t.setDaemon(True)
         t.start()
diff --git a/tests/db_pool_test.py b/tests/db_pool_test.py
index 7109883..aabd301 100644
--- a/tests/db_pool_test.py
+++ b/tests/db_pool_test.py
@@ -1,4 +1,7 @@
-"Test cases for db_pool"
+'''Test cases for db_pool
+'''
+from __future__ import with_statement
+
 import sys
 import os
 import traceback
@@ -638,11 +641,21 @@ class Psycopg2ConnectionPool(object):
         del db
 
 
-class Test01Psycopg2Tpool(Psycopg2ConnectionPool, TpoolConnectionPool, TestCase):
+class TestPsycopg2Base(TestCase):
+    __test__ = False
+
+    def test_cursor_works_as_context_manager(self):
+        with self.connection.cursor() as c:
+            c.execute('select 1')
+            row = c.fetchone()
+            assert row == (1,)
+
+
+class Test01Psycopg2Tpool(Psycopg2ConnectionPool, TpoolConnectionPool, TestPsycopg2Base):
     __test__ = True
 
 
-class Test02Psycopg2Raw(Psycopg2ConnectionPool, RawConnectionPool, TestCase):
+class Test02Psycopg2Raw(Psycopg2ConnectionPool, RawConnectionPool, TestPsycopg2Base):
     __test__ = True