diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2016-05-03 18:29:41 +0300 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-05-04 15:54:38 -0400 |
| commit | 130d0d41cf6583ce00f8dfdc999076863b685049 (patch) | |
| tree | c73e174246fb25e7a8efffb8bb6efba07ce57e91 | |
| parent | 83a9e6e1fac276090e60136aa4e9234ae23bc25a (diff) | |
| download | sqlalchemy-130d0d41cf6583ce00f8dfdc999076863b685049.tar.gz | |
Let logging format messages on demand, use warning instead of deprecated warn
(cherry picked from commit 1322edc7b1effb5bad411742b997cb2103eedfc2)
| -rw-r--r-- | lib/sqlalchemy/events.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/provision.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/events.py b/lib/sqlalchemy/events.py index 1abef26d6..34f14c605 100644 --- 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 145f96b27..4bba1be67 100644 --- 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 |