From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 7 Nov 2010 17:54:54 +0000 (-0500)
Subject: ding
X-Git-Tag: rel_0_7b1~253^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4761b66cc114402b3350cbc74ae6701a8d075455;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

ding
---

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 7d91662051..4c8797fd51 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -126,7 +126,7 @@ class Pool(log.Identified):
         self._reset_on_return = reset_on_return
         self.echo = echo
         if _dispatch:
-            self.dispatch.update(_dispatch)
+            self.dispatch.update(_dispatch, only_propagate=False)
         if listeners:
             util.warn_deprecated(
                         "The 'listeners' argument to Pool (and "
diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py
index 29591f11e5..8d0039cb89 100644
--- a/test/engine/test_pool.py
+++ b/test/engine/test_pool.py
@@ -392,9 +392,9 @@ class PoolTest(PoolTestBase):
 
             def assert_listeners(p, total, conn, cout, cin):
                 for instance in (p, p.recreate()):
-                    self.assert_(len(instance.dispatch.on_connect) == conn)
-                    self.assert_(len(instance.dispatch.on_checkout) == cout)
-                    self.assert_(len(instance.dispatch.on_checkin) == cin)
+                    eq_(len(instance.dispatch.on_connect), conn)
+                    eq_(len(instance.dispatch.on_checkout), cout)
+                    eq_(len(instance.dispatch.on_checkin), cin)
 
             p = _pool()
             assert_listeners(p, 0, 0, 0, 0)