fixes : #3689

diff --git a/lib/sqlalchemy/pool/impl.py b/lib/sqlalchemy/pool/impl.py
index 7828715f8a13ad08cca92ebfb9172253de554c17..648657ed51b6ff0f0e061923f4e8ca066ebe1412 100644 (file)
--- a/lib/sqlalchemy/pool/impl.py
+++ b/lib/sqlalchemy/pool/impl.py
@@ -183,7 +183,7 @@ class QueuePool(Pool):
         return self._pool.maxsize
 
     def timeout(self):
-        return self._pool._timeout
+        return self._timeout
 
     def checkedin(self):
         return self._pool.qsize()

diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py
index b713fdeee4fe3373ed16df53e47b1e81bca4e03d..3fcf4e09a84784e0916760eeabd2a3bba65cbffa 100644 (file)
--- a/test/engine/test_pool.py
+++ b/test/engine/test_pool.py
@@ -1117,7 +1117,7 @@ class QueuePoolTest(PoolTestBase):
         expected_timeout = 123
         p = self._queuepool_fixture(
             timeout=expected_timeout)
-        assert p.timeout() == expected_timeout
+        assert eq_(p.timeout(), expected_timeout)
 
     @testing.requires.timing_intensive
     def test_timeout(self):