- an enormous merge just because I committed a one line log entry. the joy of DVCS

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/sqlalchemy/log.py b/lib/sqlalchemy/log.py
index 5370c6431..463ca972f 100644
--- a/lib/sqlalchemy/log.py
+++ b/lib/sqlalchemy/log.py
@@ -19,7 +19,6 @@ instance only.
 
 import logging
 import sys
-from . import util
 
 # set initial level to WARN.  This so that
 # log statements don't occur in the absense of explicit
@@ -28,13 +27,17 @@ rootlogger = logging.getLogger('sqlalchemy')
 if rootlogger.level == logging.NOTSET:
     rootlogger.setLevel(logging.WARN)
 
+
 def _add_default_handler(logger):
     handler = logging.StreamHandler(sys.stdout)
     handler.setFormatter(logging.Formatter(
         '%(asctime)s %(levelname)s %(name)s %(message)s'))
     logger.addHandler(handler)
 
+
 _logged_classes = set()
+
+
 def class_logger(cls, enable=False):
     logger = logging.getLogger(cls.__module__ + "." + cls.__name__)
     if enable == 'debug':
@@ -56,6 +59,7 @@ class Identified(object):
     def _should_log_info(self):
         return self.logger.isEnabledFor(logging.INFO)
 
+
 class InstanceLogger(object):
     """A logger adapter (wrapper) for :class:`.Identified` subclasses.
 
@@ -167,6 +171,7 @@ class InstanceLogger(object):
             level = self.logger.getEffectiveLevel()
         return level
 
+
 def instance_logger(instance, echoflag=None):
     """create a logger for an instance that implements :class:`.Identified`."""
 
@@ -191,6 +196,7 @@ def instance_logger(instance, echoflag=None):
 
     instance.logger = logger
 
+
 class echo_property(object):
     __doc__ = """\
     When ``True``, enable log output for this element.