- removes the "on_" prefix.

3 files changed, 26 insertions, 26 deletions

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index c1f9905b6..e39e2b175 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -507,7 +507,7 @@ class Dialect(object):
 
         raise NotImplementedError()
 
-    def on_connect(self):
+    def connect(self):
         """return a callable which sets up a newly created DBAPI connection.
 
         The callable accepts a single argument "conn" which is the 
@@ -1967,14 +1967,14 @@ def _listener_connection_cls(cls, dispatch):
     """
     class EventListenerConnection(cls):
         def execute(self, clauseelement, *multiparams, **params):
-            for fn in dispatch.on_before_execute:
+            for fn in dispatch.before_execute:
                 clauseelement, multiparams, params = \
                     fn(self, clauseelement, multiparams, params)
             
             ret = super(EventListenerConnection, self).\
                     execute(clauseelement, *multiparams, **params)
 
-            for fn in dispatch.on_after_execute:
+            for fn in dispatch.after_execute:
                 fn(self, clauseelement, multiparams, params, ret)
             
             return ret
@@ -1987,7 +1987,7 @@ def _listener_connection_cls(cls, dispatch):
 
         def _before_cursor_execute(self, context, cursor, 
                                             statement, parameters):
-            for fn in dispatch.on_before_cursor_execute:
+            for fn in dispatch.before_cursor_execute:
                 statement, parameters = \
                             fn(self, cursor, statement, parameters, 
                                         context, context.executemany)
@@ -1995,59 +1995,59 @@ def _listener_connection_cls(cls, dispatch):
         
         def _after_cursor_execute(self, context, cursor, 
                                             statement, parameters):
-            dispatch.on_after_cursor_execute(self, cursor, 
+            dispatch.after_cursor_execute(self, cursor, 
                                                 statement, 
                                                 parameters, 
                                                 context, 
                                                 context.executemany)
             
         def _begin_impl(self):
-            dispatch.on_begin(self)
+            dispatch.begin(self)
             return super(EventListenerConnection, self).\
                         _begin_impl()
             
         def _rollback_impl(self):
-            dispatch.on_rollback(self)
+            dispatch.rollback(self)
             return super(EventListenerConnection, self).\
                         _rollback_impl()
 
         def _commit_impl(self):
-            dispatch.on_commit(self)
+            dispatch.commit(self)
             return super(EventListenerConnection, self).\
                         _commit_impl()
 
         def _savepoint_impl(self, name=None):
-            dispatch.on_savepoint(self, name)
+            dispatch.savepoint(self, name)
             return super(EventListenerConnection, self).\
                         _savepoint_impl(name=name)
                 
         def _rollback_to_savepoint_impl(self, name, context):
-            dispatch.on_rollback_savepoint(self, name, context)
+            dispatch.rollback_savepoint(self, name, context)
             return super(EventListenerConnection, self).\
                         _rollback_to_savepoint_impl(name, context)
             
         def _release_savepoint_impl(self, name, context):
-            dispatch.on_release_savepoint(self, name, context)
+            dispatch.release_savepoint(self, name, context)
             return super(EventListenerConnection, self).\
                         _release_savepoint_impl(name, context)
             
         def _begin_twophase_impl(self, xid):
-            dispatch.on_begin_twophase(self, xid)
+            dispatch.begin_twophase(self, xid)
             return super(EventListenerConnection, self).\
                         _begin_twophase_impl(xid)
 
         def _prepare_twophase_impl(self, xid):
-            dispatch.on_prepare_twophase(self, xid)
+            dispatch.prepare_twophase(self, xid)
             return super(EventListenerConnection, self).\
                         _prepare_twophase_impl(xid)
 
         def _rollback_twophase_impl(self, xid, is_prepared):
-            dispatch.on_rollback_twophase(self, xid)
+            dispatch.rollback_twophase(self, xid)
             return super(EventListenerConnection, self).\
                         _rollback_twophase_impl(xid, is_prepared)
 
         def _commit_twophase_impl(self, xid, is_prepared):
-            dispatch.on_commit_twophase(self, xid, is_prepared)
+            dispatch.commit_twophase(self, xid, is_prepared)
             return super(EventListenerConnection, self).\
                         _commit_twophase_impl(xid, is_prepared)
 
diff --git a/lib/sqlalchemy/engine/ddl.py b/lib/sqlalchemy/engine/ddl.py
index 0e165b8f5..76af06529 100644
--- a/lib/sqlalchemy/engine/ddl.py
+++ b/lib/sqlalchemy/engine/ddl.py
@@ -35,20 +35,20 @@ class SchemaGenerator(DDLBase):
             tables = metadata.tables.values()
         collection = [t for t in sql_util.sort_tables(tables) if self._can_create(t)]
         
-        metadata.dispatch.on_before_create(metadata, self.connection,
+        metadata.dispatch.before_create(metadata, self.connection,
                                     tables=collection)
         
         for table in collection:
             self.traverse_single(table, create_ok=True)
             
-        metadata.dispatch.on_after_create(metadata, self.connection,
+        metadata.dispatch.after_create(metadata, self.connection,
                                     tables=collection)
 
     def visit_table(self, table, create_ok=False):
         if not create_ok and not self._can_create(table):
             return
         
-        table.dispatch.on_before_create(table, self.connection)
+        table.dispatch.before_create(table, self.connection)
 
         for column in table.columns:
             if column.default is not None:
@@ -60,7 +60,7 @@ class SchemaGenerator(DDLBase):
             for index in table.indexes:
                 self.traverse_single(index)
 
-        table.dispatch.on_after_create(table, self.connection)
+        table.dispatch.after_create(table, self.connection)
 
     def visit_sequence(self, sequence):
         if self.dialect.supports_sequences:
@@ -89,13 +89,13 @@ class SchemaDropper(DDLBase):
             tables = metadata.tables.values()
         collection = [t for t in reversed(sql_util.sort_tables(tables)) if self._can_drop(t)]
         
-        metadata.dispatch.on_before_drop(metadata, self.connection,
+        metadata.dispatch.before_drop(metadata, self.connection,
                                             tables=collection)
         
         for table in collection:
             self.traverse_single(table, drop_ok=True)
 
-        metadata.dispatch.on_after_drop(metadata, self.connection,
+        metadata.dispatch.after_drop(metadata, self.connection,
                                             tables=collection)
 
     def _can_drop(self, table):
@@ -111,7 +111,7 @@ class SchemaDropper(DDLBase):
         if not drop_ok and not self._can_drop(table):
             return
 
-        table.dispatch.on_before_drop(table, self.connection)
+        table.dispatch.before_drop(table, self.connection)
 
         for column in table.columns:
             if column.default is not None:
@@ -119,7 +119,7 @@ class SchemaDropper(DDLBase):
 
         self.connection.execute(schema.DropTable(table))
         
-        table.dispatch.on_after_drop(table, self.connection)
+        table.dispatch.after_drop(table, self.connection)
 
     def visit_sequence(self, sequence):
         if self.dialect.supports_sequences:
diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index 5a81bd5f2..1191006c4 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(pool, 'on_first_connect', on_connect)
-                event.listen(pool, 'on_connect', on_connect)
+                event.listen(pool, 'first_connect', on_connect)
+                event.listen(pool, 'connect', on_connect)
                     
             def first_connect(dbapi_connection, connection_record):
                 c = base.Connection(engine, connection=dbapi_connection)
                 dialect.initialize(c)
-            event.listen(pool, 'on_first_connect', first_connect)
+            event.listen(pool, 'first_connect', first_connect)
 
         return engine