Update deprecated features to the next life-cycle stage

1 files changed, 46 insertions, 36 deletions

diff --git a/src/engine/SCons/Warnings.py b/src/engine/SCons/Warnings.py
index 1fa6302..b17d863 100644
--- a/src/engine/SCons/Warnings.py
+++ b/src/engine/SCons/Warnings.py
@@ -36,20 +36,6 @@ import SCons.Errors
 class Warning(SCons.Errors.UserError):
     pass
 
-class MandatoryWarning(Warning):
-    pass
-
-
-
-class FutureDeprecatedWarning(Warning):
-    pass
-
-class DeprecatedWarning(Warning):
-    pass
-
-class MandatoryDeprecatedWarning(MandatoryWarning):
-    pass
-
 
 
 # NOTE:  If you add a new warning class, add it to the man page, too!
@@ -63,18 +49,6 @@ class CorruptSConsignWarning(Warning):
 class DependencyWarning(Warning):
     pass
 
-class DeprecatedCopyWarning(DeprecatedWarning):
-    pass
-
-class DeprecatedOptionsWarning(DeprecatedWarning):
-    pass
-
-class DeprecatedSourceSignaturesWarning(DeprecatedWarning):
-    pass
-
-class DeprecatedTargetSignaturesWarning(DeprecatedWarning):
-    pass
-
 class DuplicateEnvironmentWarning(Warning):
     pass
 
@@ -102,18 +76,12 @@ class NoObjectCountWarning(Warning):
 class NoParallelSupportWarning(Warning):
     pass
 
-class PythonVersionWarning(DeprecatedWarning):
-    pass
-
 class ReservedVariableWarning(Warning):
     pass
 
 class StackSizeWarning(Warning):
     pass
 
-class TaskmasterNeedsExecuteWarning(FutureDeprecatedWarning):
-    pass
-
 class VisualCMissingWarning(Warning):
     pass
 
@@ -128,12 +96,55 @@ class VisualStudioMissingWarning(Warning):
 class FortranCxxMixWarning(LinkWarning):
     pass
 
-_warningAsException = 0
+
+# Deprecation warnings
+
+class FutureDeprecatedWarning(Warning):
+    pass
+
+class DeprecatedWarning(Warning):
+    pass
+
+class MandatoryDeprecatedWarning(DeprecatedWarning):
+    pass
+
+
+class PythonVersionWarning(DeprecatedWarning):
+    pass
+
+class DeprecatedCopyWarning(MandatoryDeprecatedWarning):
+    pass
+
+class DeprecatedOptionsWarning(MandatoryDeprecatedWarning):
+    pass
+
+class DeprecatedSourceSignaturesWarning(MandatoryDeprecatedWarning):
+    pass
+
+class DeprecatedTargetSignaturesWarning(MandatoryDeprecatedWarning):
+    pass
+
+class TaskmasterNeedsExecuteWarning(DeprecatedWarning):
+    pass
+
+class DeprecatedDebugOptionsWarning(MandatoryDeprecatedWarning):
+    pass
+
+class DeprecatedSigModuleWarning(MandatoryDeprecatedWarning):
+    pass
+
+class DeprecatedBuilderKeywordsWarning(MandatoryDeprecatedWarning):
+    pass
+
 
 # The below is a list of 2-tuples.  The first element is a class object.
 # The second element is true if that class is enabled, false if it is disabled.
 _enabled = []
 
+# If set, raise the warning as an exception
+_warningAsException = 0
+
+# If not None, a function to call with the warning
 _warningOut = None
 
 def suppressWarningClass(clazz):
@@ -142,7 +153,7 @@ def suppressWarningClass(clazz):
     _enabled.insert(0, (clazz, 0))
 
 def enableWarningClass(clazz):
-    """Suppresses all warnings that are of type clazz or
+    """Enable all warnings that are of type clazz or
     derived from clazz."""
     _enabled.insert(0, (clazz, 1))
 
@@ -181,8 +192,7 @@ def process_warn_strings(arguments):
     "Warning" is appended to get the class name.
 
     For example, 'deprecated' will enable the DeprecatedWarning
-    class.  'no-dependency' will disable the .DependencyWarning
-    class.
+    class.  'no-dependency' will disable the DependencyWarning class.
 
     As a special case, --warn=all and --warn=no-all will enable or
     disable (respectively) the base Warning class of all warnings.