Fix test/SCONSFLAGS.py to handle python version deprecation message

Author: bdbaddog

test/SCONSFLAGS.py

@@ -28,15 +28,16 @@
 import TestCmd
 import TestSCons
 
-test = TestSCons.TestSCons(match = TestCmd.match_re_dotall,ignore_python_version=0)
+test = TestSCons.TestSCons(match=TestCmd.match_re_dotall, ignore_python_version=False)
 
 wpath = test.workpath()
 
 test.write('SConstruct', r"""
 Help("Help text.\n")
 """)
 
-expect = """scons: Reading SConscript files ...
+expect_help = """\
+scons: Reading SConscript files ...
 scons: done reading SConscript files.
 Help text.
 
@@ -45,31 +46,33 @@
 
 os.environ['SCONSFLAGS'] = ''
 
-test.run(arguments = '-h',
-         stdout = expect,
-         stderr = TestSCons.deprecated_python_expr)
+test.run(arguments='-h',
+         stdout=expect_help,
+         stderr=TestSCons.deprecated_python_expr)
 
 os.environ['SCONSFLAGS'] = '-h'
 
-test.run(stdout = expect,
-         stderr = TestSCons.deprecated_python_expr)
+test.run(stdout=expect_help,
+         stderr=TestSCons.deprecated_python_expr)
 
-# No TestSCons.deprecated_python_expr because the -H option gets
+# Don't check for deprecated_python_expr because the -H option gets
 # processed before the SConscript files and therefore before we check
 # for the deprecation warning.
-test.run(arguments = "-H")
+os.environ['SCONSFLAGS'] = ''
+test.run(arguments="-H")
 
 test.must_not_contain_any_line(test.stdout(), ['Help text.'])
 test.must_contain_all_lines(test.stdout(), ['-H, --help-options'])
 
-expect = r"""usage: scons [OPTIONS] [VARIABLES] [TARGETS]
+expect_no_opt = TestSCons.deprecated_python_expr + \
+r"""usage: scons \[OPTIONS\] \[VARIABLES\] \[TARGETS\]
 
 SCons Error: no such option: -Z
 """
 
-test.run(arguments="-Z", status=2, stderr=expect, match=TestSCons.match_exact)
+test.run(arguments="-Z", status=2, stdout=None, stderr=expect_no_opt)
 
 os.environ['SCONSFLAGS'] = '-Z'
-test.run(status=2, stderr=expect, match=TestSCons.match_exact)
+test.run(status=2, stdout=None, stderr=expect_no_opt)
 
 test.pass_test()

testing/framework/TestSCons.py

@@ -190,17 +190,17 @@ def deprecated_python_version(version=sys.version_info):
 
 
 if deprecated_python_version():
-    msg = r"""
-scons: warning: Support for Python older than %s is deprecated (%s detected).
+    deprecated_python_msg = rf"""
+scons: warning: Support for Python older than {python_version_supported_str} is deprecated ({python_version_string()} detected).
     If this will cause hardship, contact scons-dev@python.org
 """
     deprecated_python_expr = (
-        re_escape(msg % (python_version_supported_str, python_version_string()))
+        re_escape(deprecated_python_msg )
         + file_expr
     )
-    del msg
 else:
     deprecated_python_expr = ""
+    deprecated_python_msg = ""
 
 
 def initialize_sconsflags(ignore_python_version):