From: Brad Allen <bradallen137@gmail.com>
Date: Mon, 15 Mar 2010 17:42:35 +0000 (-0600)
Subject: merged mainline default branch
X-Git-Tag: rel_0_6beta2~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00ac90accb8d29cd665a9c14089c51a32afb3bd8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merged mainline default branch
---

00ac90accb8d29cd665a9c14089c51a32afb3bd8
diff --cc lib/sqlalchemy/connectors/mxodbc.py
index de9638151f,a646473fb7..2374b4c95c
--- a/lib/sqlalchemy/connectors/mxodbc.py
+++ b/lib/sqlalchemy/connectors/mxodbc.py
@@@ -29,16 -26,13 +29,15 @@@ class MxODBCConnector(Connector)
              raise ImportError, "Unrecognized platform for mxODBC import"
          return module
  
-     def visit_pool(self, pool):
-         def connect(conn, rec):
+     def on_connect(self):
+         def connect(conn):
              conn.stringformat = self.dbapi.MIXED_STRINGFORMAT
              conn.datetimeformat = self.dbapi.PYDATETIME_DATETIMEFORMAT
 +            conn.errorhandler = error_handler
 +            # Alternatives to experiment with:
              #conn.bindmethod = self.dbapi.BIND_USING_PYTHONTYPE
              #conn.bindmethod = self.dbapi.BIND_USING_SQLTYPE
- 
-         pool.add_listener({'connect':connect})
+         return connect
  
      def create_connect_args(self, url):
          """ Return a tuple of *args,**kwargs for creating a connection.