Let logging format messages on demand, use warning instead of deprecated warn

(cherry picked from commit 1322edc7b1effb5bad411742b997cb2103eedfc2)

diff --git a/lib/sqlalchemy/events.py b/lib/sqlalchemy/events.py
index 1abef26d64c5015225df12217f99f3a7a7a1e0ef..34f14c605d5713b267f7c62012bc5b78c3fc9281 100644 (file)
--- a/lib/sqlalchemy/events.py
+++ b/lib/sqlalchemy/events.py
@@ -424,7 +424,7 @@ class ConnectionEvents(event.Events):
 
         def before_cursor_execute(conn, cursor, statement, parameters, context,
                                                         executemany):
-            log.info("Received statement: %s" % statement)
+            log.info("Received statement: %s", statement)
 
         engine = create_engine('postgresql://scott:tiger@localhost/test')
         event.listen(engine, "before_cursor_execute", before_cursor_execute)
@@ -435,7 +435,7 @@ class ConnectionEvents(event.Events):
             @event.listens_for(conn, 'before_cursor_execute')
             def before_cursor_execute(conn, cursor, statement, parameters,
                                             context, executemany):
-                log.info("Received statement: %s" % statement)
+                log.info("Received statement: %s", statement)
 
     When the methods are called with a `statement` parameter, such as in
     :meth:`.after_cursor_execute`, :meth:`.before_cursor_execute` and

diff --git a/lib/sqlalchemy/testing/provision.py b/lib/sqlalchemy/testing/provision.py
index 145f96b2765b2a2b317657d74b34c33d707c9d2e..4bba1be670c2c3e574b00b54eba1737051575e97 100644 (file)
--- a/lib/sqlalchemy/testing/provision.py
+++ b/lib/sqlalchemy/testing/provision.py
@@ -251,10 +251,10 @@ def _oracle_configure_follower(config, ident):
 def _ora_drop_ignore(conn, dbname):
     try:
         conn.execute("drop user %s cascade" % dbname)
-        log.info("Reaped db: %s" % dbname)
+        log.info("Reaped db: %s", dbname)
         return True
     except exc.DatabaseError as err:
-        log.warn("couldn't drop db: %s" % err)
+        log.warning("couldn't drop db: %s", err)
         return False