From: Ville Skyttä Date: Tue, 3 May 2016 15:29:41 +0000 (+0300) Subject: Let logging format messages on demand, use warning instead of deprecated warn X-Git-Tag: rel_1_1_0b1~57^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1322edc7b1effb5bad411742b997cb2103eedfc2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Let logging format messages on demand, use warning instead of deprecated warn --- diff --git a/lib/sqlalchemy/events.py b/lib/sqlalchemy/events.py index c679db37da..e99c5b5e5a 100644 --- a/lib/sqlalchemy/events.py +++ b/lib/sqlalchemy/events.py @@ -464,7 +464,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) @@ -475,7 +475,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 b3812cf048..65a3c10a6e 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