From 67a55a6b45fec300bea42c18be41cf0a2f931072 Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Fri, 11 Feb 2011 21:26:51 -0700
Subject: Enable some DeprecationWarnings

We'll be skipping the Pending Deprecation step given our release process.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
 lib/bb/__init__.py     |  6 +++---
 lib/bb/msg.py          | 22 ++++++++++------------
 lib/bb/persist_data.py |  5 +++--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py
index 0f22d15af..d060002b2 100644
--- a/lib/bb/__init__.py
+++ b/lib/bb/__init__.py
@@ -96,7 +96,7 @@ def fatal(*args):
     sys.exit(1)
 
 
-def deprecated(func, name = None, advice = ""):
+def deprecated(func, name=None, advice=""):
     """This is a decorator which can be used to mark functions
     as deprecated. It will result in a warning being emmitted
     when the function is used."""
@@ -110,8 +110,8 @@ def deprecated(func, name = None, advice = ""):
     def newFunc(*args, **kwargs):
         warnings.warn("Call to deprecated function %s%s." % (name,
                                                              advice),
-                      category = PendingDeprecationWarning,
-                      stacklevel = 2)
+                      category=DeprecationWarning,
+                      stacklevel=2)
         return func(*args, **kwargs)
     newFunc.__name__ = func.__name__
     newFunc.__doc__ = func.__doc__
diff --git a/lib/bb/msg.py b/lib/bb/msg.py
index 1f9ff904a..a7ac85079 100644
--- a/lib/bb/msg.py
+++ b/lib/bb/msg.py
@@ -147,8 +147,8 @@ def set_debug_domains(domainargs):
 #
 
 def debug(level, msgdomain, msg):
-    warnings.warn("bb.msg.debug will soon be deprecated in favor of the python 'logging' module",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("bb.msg.debug is deprecated in favor of the python 'logging' module",
+                  DeprecationWarning, stacklevel=2)
     level = logging.DEBUG - (level - 1)
     if not msgdomain:
         logger.debug(level, msg)
@@ -156,13 +156,13 @@ def debug(level, msgdomain, msg):
         loggers[msgdomain].debug(level, msg)
 
 def plain(msg):
-    warnings.warn("bb.msg.plain will soon be deprecated in favor of the python 'logging' module",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("bb.msg.plain is deprecated in favor of the python 'logging' module",
+                  DeprecationWarning, stacklevel=2)
     logger.plain(msg)
 
 def note(level, msgdomain, msg):
-    warnings.warn("bb.msg.note will soon be deprecated in favor of the python 'logging' module",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("bb.msg.note is deprecated in favor of the python 'logging' module",
+                  DeprecationWarning, stacklevel=2)
     if level > 1:
         if msgdomain:
             logger.verbose(msg)
@@ -175,24 +175,22 @@ def note(level, msgdomain, msg):
             loggers[msgdomain].info(msg)
 
 def warn(msgdomain, msg):
-    warnings.warn("bb.msg.warn will soon be deprecated in favor of the python 'logging' module",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("bb.msg.warn is deprecated in favor of the python 'logging' module",
+                  DeprecationWarning, stacklevel=2)
     if not msgdomain:
         logger.warn(msg)
     else:
         loggers[msgdomain].warn(msg)
 
 def error(msgdomain, msg):
-    warnings.warn("bb.msg.error will soon be deprecated in favor of the python 'logging' module",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("bb.msg.error is deprecated in favor of the python 'logging' module",
+                  DeprecationWarning, stacklevel=2)
     if not msgdomain:
         logger.error(msg)
     else:
         loggers[msgdomain].error(msg)
 
 def fatal(msgdomain, msg):
-    warnings.warn("bb.msg.fatal will soon be deprecated in favor of raising appropriate exceptions",
-                  PendingDeprecationWarning, stacklevel=2)
     if not msgdomain:
         logger.critical(msg)
     else:
diff --git a/lib/bb/persist_data.py b/lib/bb/persist_data.py
index 2c424f29b..bd60fca7c 100644
--- a/lib/bb/persist_data.py
+++ b/lib/bb/persist_data.py
@@ -106,8 +106,9 @@ class SQLTable(collections.MutableMapping):
 class PersistData(object):
     """Deprecated representation of the bitbake persistent data store"""
     def __init__(self, d):
-        warnings.warn("Use of PersistData will be deprecated in the future",
-                      category=PendingDeprecationWarning,
+        warnings.warn("Use of PersistData is deprecated.  Please use "
+                      "persist(domain, d) instead.",
+                      category=DeprecationWarning,
                       stacklevel=2)
 
         self.data = persist(d)
-- 
cgit 1.2.3-korg