Additional clean up of how we import some SCons.* module names, including

making SCons.Job.stack_size a variable that always exists, instead of
one that gets set from outside and requires SCons.Job to check for an
AttributeError.

2 files changed, 3 insertions, 4 deletions

diff --git a/src/engine/SCons/Script/Interactive.py b/src/engine/SCons/Script/Interactive.py
index a024a9e..46582c5 100644
--- a/src/engine/SCons/Script/Interactive.py
+++ b/src/engine/SCons/Script/Interactive.py
@@ -98,8 +98,6 @@ try:
 except ImportError:
     pass
 
-import SCons
-
 class SConsInteractiveCmd(cmd.Cmd):
     """\
     build [TARGETS]         Build the specified TARGETS and their dependencies.
@@ -163,6 +161,7 @@ class SConsInteractiveCmd(cmd.Cmd):
         build [TARGETS]         Build the specified TARGETS and their
                                 dependencies.  'b' is a synonym.
         """
+        import SCons.Node
         import SCons.SConsign
         import SCons.Script.Main
 
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index dc24b22..12e7fba 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -963,8 +963,8 @@ def _main(parser):
     SCons.Node.implicit_cache = options.implicit_cache
     SCons.Node.FS.set_duplicate(options.duplicate)
     fs.set_max_drift(options.max_drift)
-    if not options.stack_size is None:
-        SCons.Job.stack_size = options.stack_size
+
+    SCons.Job.explicit_stack_size = options.stack_size
 
     platform = SCons.Platform.platform_module()