summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-12-01 14:10:11 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2010-12-01 14:10:11 -0500
commitd30678d18de7828f03f8179d7980cab2e66c18bc (patch)
tree65cc0185dd53af871ec8b2993ea2752475ae926b /lib/sqlalchemy/engine
parentdf7379f992938af7ec05f0c46ccef3305ebcd5cc (diff)
downloadsqlalchemy-d30678d18de7828f03f8179d7980cab2e66c18bc.tar.gz
new calling style: event.listen(target, identifier, fn)
Diffstat (limited to 'lib/sqlalchemy/engine')
-rw-r--r--lib/sqlalchemy/engine/strategies.py6
-rw-r--r--lib/sqlalchemy/engine/threadlocal.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index 8de29271b..5a81bd5f2 100644
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -137,13 +137,13 @@ class DefaultEngineStrategy(EngineStrategy):
return
do_on_connect(conn)
- event.listen(on_connect, 'on_first_connect', pool)
- event.listen(on_connect, 'on_connect', pool)
+ event.listen(pool, 'on_first_connect', on_connect)
+ event.listen(pool, 'on_connect', on_connect)
def first_connect(dbapi_connection, connection_record):
c = base.Connection(engine, connection=dbapi_connection)
dialect.initialize(c)
- event.listen(first_connect, 'on_first_connect', pool)
+ event.listen(pool, 'on_first_connect', first_connect)
return engine
diff --git a/lib/sqlalchemy/engine/threadlocal.py b/lib/sqlalchemy/engine/threadlocal.py
index 9635cce17..b6fa14af7 100644
--- a/lib/sqlalchemy/engine/threadlocal.py
+++ b/lib/sqlalchemy/engine/threadlocal.py
@@ -29,12 +29,12 @@ class TLConnection(base.Connection):
class TLEvents(events.EngineEvents):
@classmethod
- def listen(cls, fn, identifier, target):
+ def listen(cls, target, identifier, fn):
if target.TLConnection is TLConnection:
target.TLConnection = base._listener_connection_cls(
TLConnection,
target.dispatch)
- events.EngineEvents.listen(fn, identifier, target)
+ events.EngineEvents.listen(target, identifier, fn)
class TLEngine(base.Engine):
"""An Engine that includes support for thread-local managed transactions."""