diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-07-25 13:08:39 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-07-25 13:08:39 -0400 |
| commit | 9cbfe389f7f4b227a3319d0c28919b3df80079b0 (patch) | |
| tree | f1b834af0c135ee06e30ea45921ad342ba0038da /lib/sqlalchemy/pool.py | |
| parent | d9a6641dc8dfea02936d37d58bc446cb4fa1f1b5 (diff) | |
| download | sqlalchemy-9cbfe389f7f4b227a3319d0c28919b3df80079b0.tar.gz | |
- pretty much all tests passing, maybe some callcounts are off
- test suite adjusted to use engine/pool events and not listeners
- deprecation warnings
Diffstat (limited to 'lib/sqlalchemy/pool.py')
| -rw-r--r-- | lib/sqlalchemy/pool.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py index aa8d362f8..9574d28da 100644 --- a/lib/sqlalchemy/pool.py +++ b/lib/sqlalchemy/pool.py @@ -125,8 +125,11 @@ class Pool(log.Identified): self._reset_on_return = reset_on_return self.echo = echo if _dispatch: - self.events = _dispatch + self.events.update(_dispatch) if listeners: + util.warn_deprecated( + "The 'listeners' argument to Pool (and " + "create_engine()) is deprecated. Use event.listen().") for l in listeners: self.add_listener(l) @@ -203,7 +206,7 @@ class Pool(log.Identified): """ events = event.dispatcher(events) - @util.deprecated("Use event.listen()") + @util.deprecated("Pool.add_listener() is deprecated. Use event.listen()") def add_listener(self, listener): """Add a ``PoolListener``-like object to this pool. @@ -275,7 +278,7 @@ class _ConnectionRecord(object): self.connection = self.__connect() self.info = {} - pool.events.on_first_connect.exec_and_clear(self.connection, self) + pool.events.on_first_connect.exec_once(self.connection, self) pool.events.on_connect(self.connection, self) def close(self): @@ -305,7 +308,7 @@ class _ConnectionRecord(object): self.connection = self.__connect() self.info.clear() if self.__pool.events.on_connect: - self.__pool.events.on_connect(self.connection, con_record) + self.__pool.events.on_connect(self.connection, self) elif self.__pool._recycle > -1 and \ time.time() - self.starttime > self.__pool._recycle: self.__pool.logger.info( @@ -315,7 +318,7 @@ class _ConnectionRecord(object): self.connection = self.__connect() self.info.clear() if self.__pool.events.on_connect: - self.__pool.events.on_connect(self.connection, con_record) + self.__pool.events.on_connect(self.connection, self) return self.connection def __close(self): |