diff options
| author | Mike Bayer <classic@zzzcomputing.com> | 2014-11-12 09:38:41 -0500 |
|---|---|---|
| committer | Mike Bayer <classic@zzzcomputing.com> | 2014-11-12 09:38:41 -0500 |
| commit | 64e53f26a538e4965fcab76b1a457f15a43a0d0c (patch) | |
| tree | f1dbe27d783677005f4d2492ca9ead197050997c | |
| parent | b013fb82f5a5d891c6fd776e0e6ed926cdf2ffe1 (diff) | |
| parent | 30075f9015c91d945c620af0d84c9c162627aa3c (diff) | |
| download | sqlalchemy-64e53f26a538e4965fcab76b1a457f15a43a0d0c.tar.gz | |
Merged in jon_nelson/sqlalchemy/logging_interpolation (pull request #35)
- don't do inline string interpolation when logging
| -rw-r--r-- | doc/build/faq.rst | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/build/faq.rst b/doc/build/faq.rst index 12d8e0acc..586f66754 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 2fb054d0c..58eb3afa0 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 cdb501c14..d95f17f64 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 |