Restore (some) old SCons.Script.* names, some released SConscript files are using them.

1 files changed, 40 insertions, 2 deletions

diff --git a/test/Script-import.py b/test/Script-import.py
index 90052a5f..4dd8d914 100644
--- a/test/Script-import.py
+++ b/test/Script-import.py
@@ -25,8 +25,9 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
-Test that a module that we import into an SConscript file
-can itself easily import the global SCons variables.
+Test that a module that we import into an SConscript file can itself
+easily import the global SCons variables, and a handful of other variables
+directly from SCons.Script modules.
 """
 
 import TestSCons
@@ -44,6 +45,8 @@ SConscript('SConscript')
 
 test.write('SConscript', """\
 import m2
+import m3
+import m4
 """)
 
 test.write("m2.py", """\
@@ -51,6 +54,41 @@ from SCons.Script import *
 Command("file.out", "file.in", Copy("$TARGET", "$SOURCE"))
 """)
 
+test.write("m3.py", """\
+import SCons.Script
+
+SCons.Script.BuildTask
+SCons.Script.CleanTask
+SCons.Script.QuestionTask
+#SCons.Script.PrintHelp
+SCons.Script.OptParser
+SCons.Script.SConscriptSettableOptions
+
+SCons.Script.keep_going_on_error
+SCons.Script.print_dtree
+SCons.Script.print_explanations
+SCons.Script.print_includes
+SCons.Script.print_objects
+SCons.Script.print_time
+SCons.Script.print_tree
+SCons.Script.memory_stats
+SCons.Script.ignore_errors
+#SCons.Script.sconscript_time
+#SCons.Script.command_time
+#SCons.Script.exit_status
+#SCons.Script.profiling
+SCons.Script.repositories
+""")
+
+test.write("m4.py", """\
+import SCons.Script.SConscript
+SCons.Script.SConscript.Arguments
+SCons.Script.SConscript.ArgList
+SCons.Script.SConscript.BuildTargets
+SCons.Script.SConscript.CommandLineTargets
+SCons.Script.SConscript.DefaultTargets
+""")
+
 test.write("file.in", "file.in\n")
 
 test.run(arguments = '.')