From: Jon Nelson <jnelson-suse@jamponi.net>
Date: Wed, 12 Nov 2014 03:34:57 +0000 (-0600)
Subject: - don't do inline string interpolation when logging
X-Git-Tag: rel_1_0_0~19^2~23^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30075f9015c91d945c620af0d84c9c162627aa3c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- don't do inline string interpolation when logging
---

diff --git a/doc/build/faq.rst b/doc/build/faq.rst
index 12d8e0acc6..586f667545 100644
--- a/doc/build/faq.rst
+++ b/doc/build/faq.rst
@@ -757,14 +757,14 @@ using a recipe like the following::
     def before_cursor_execute(conn, cursor, statement,
                             parameters, context, executemany):
         conn.info.setdefault('query_start_time', []).append(time.time())
-        logger.debug("Start Query: %s" % statement)
+        logger.debug("Start Query: %s", statement)
 
     @event.listens_for(Engine, "after_cursor_execute")
     def after_cursor_execute(conn, cursor, statement,
                             parameters, context, executemany):
         total = time.time() - conn.info['query_start_time'].pop(-1)
         logger.debug("Query Complete!")
-        logger.debug("Total Time: %f" % total)
+        logger.debug("Total Time: %f", total)
 
 Above, we use the :meth:`.ConnectionEvents.before_cursor_execute` and
 :meth:`.ConnectionEvents.after_cursor_execute` events to establish an interception
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 2fb054d0c2..58eb3afa03 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -2593,7 +2593,7 @@ class MySQLDialect(default.DefaultDialect):
                 pass
             else:
                 self.logger.info(
-                    "Converting unknown KEY type %s to a plain KEY" % flavor)
+                    "Converting unknown KEY type %s to a plain KEY", flavor)
                 pass
             index_d = {}
             index_d['name'] = spec['name']
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index cdb501c14f..d95f17f648 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -373,7 +373,7 @@ class LazyLoader(AbstractRelationshipLoader):
                         self._equated_columns[c] = self._equated_columns[col]
 
             self.logger.info("%s will use query.get() to "
-                             "optimize instance loads" % self)
+                             "optimize instance loads", self)
 
     def init_class_attribute(self, mapper):
         self.is_class_level = True