From: Jonathan Ellis <jbellis@gmail.com>
Date: Mon, 30 Jul 2007 23:50:45 +0000 (+0000)
Subject: log-ify warnings module.  get rid of one-per-customer deprecationwarning limit.
X-Git-Tag: rel_0_4beta1~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7e81eda731ddf11994ea77ac556168388c9285b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

log-ify warnings module.  get rid of one-per-customer deprecationwarning limit.
---

diff --git a/lib/sqlalchemy/logging.py b/lib/sqlalchemy/logging.py
index f02e3f746f..1e62708293 100644
--- a/lib/sqlalchemy/logging.py
+++ b/lib/sqlalchemy/logging.py
@@ -26,13 +26,17 @@ is equivalent to::
     logging.getLogger('sqlalchemy.engine.Engine.%s' % hex(id(engine))).setLevel(logging.DEBUG)
 """
 
-import sys
+import sys, warnings
 
 # py2.5 absolute imports will fix....
 logging = __import__('logging')
 
 
-logging.getLogger('sqlalchemy').setLevel(logging.WARN)
+rootlogger = logging.getLogger('sqlalchemy')
+rootlogger.setLevel(logging.WARN)
+def _logwarning(message, category, filename, lineno, file='ignored'):
+    rootlogger.warn(warnings.formatwarning(message, category, filename, lineno))
+warnings.showwarning = _logwarning
 
 default_enabled = False
 def default_logging(name):
@@ -41,7 +45,6 @@ def default_logging(name):
         default_enabled=True
     if not default_enabled:
         default_enabled = True
-        rootlogger = logging.getLogger('sqlalchemy')
         handler = logging.StreamHandler(sys.stdout)
         handler.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(name)s %(message)s'))
         rootlogger.addHandler(handler)
diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index c9c20ef451..4925caa695 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -541,19 +541,11 @@ class ScopedRegistry(object):
         return self.scopefunc()
 
 
-_warned = Set()
-
 def warn_deprecated(msg):
-    if msg in _warned:
-        return
-    _warned.add(msg)
     warnings.warn(msg, category=DeprecationWarning, stacklevel=3)
 
 def deprecated(func, add_deprecation_to_docstring=True):
     def func_with_warning(*args, **kwargs):
-        if func in _warned:
-            return func(*args, **kwargs)
-        _warned.add(func)
         warnings.warn("Call to deprecated function %s" % func.__name__,
                       category=DeprecationWarning,
                       stacklevel=2)