From 130d0d41cf6583ce00f8dfdc999076863b685049 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ville=20Skytt=C3=A4?= Date: Tue, 3 May 2016 18:29:41 +0300 Subject: [PATCH] Let logging format messages on demand, use warning instead of deprecated warn (cherry picked from commit 1322edc7b1effb5bad411742b997cb2103eedfc2) --- lib/sqlalchemy/events.py | 4 ++-- 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 1abef26d64..34f14c605d 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 145f96b276..4bba1be670 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 -- 2.47.3