move Taskmaster and Jobs to SCons.Taskmaster

6 files changed, 19 insertions, 20 deletions

diff --git a/SCons/SConf.py b/SCons/SConf.py
index 2a427df..fe14a0c 100644
--- a/SCons/SConf.py
+++ b/SCons/SConf.py
@@ -43,7 +43,7 @@ import traceback
 import SCons.Action
 import SCons.Builder
 import SCons.Errors
-import SCons.Job
+import SCons.Taskmaster.Job
 import SCons.Node.FS
 import SCons.Taskmaster
 import SCons.Util
@@ -551,7 +551,7 @@ class SConfBase:
             SConfFS.set_max_drift(0)
             tm = SCons.Taskmaster.Taskmaster(nodes, SConfBuildTask)
             # we don't want to build tests in parallel
-            jobs = SCons.Job.Jobs(1, tm )
+            jobs = SCons.Taskmaster.Job.Jobs(1, tm)
             jobs.run()
             for n in nodes:
                 state = n.get_state()
diff --git a/SCons/Script/Main.py b/SCons/Script/Main.py
index 1b06a64..22042f5 100644
--- a/SCons/Script/Main.py
+++ b/SCons/Script/Main.py
@@ -52,7 +52,7 @@ import SCons.Debug
 import SCons.Defaults
 import SCons.Environment
 import SCons.Errors
-import SCons.Job
+import SCons.Taskmaster.Job
 import SCons.Node
 import SCons.Node.FS
 import SCons.Platform
@@ -1134,7 +1134,7 @@ def _main(parser):
     SCons.Node.FS.set_duplicate(options.duplicate)
     fs.set_max_drift(options.max_drift)
 
-    SCons.Job.explicit_stack_size = options.stack_size
+    SCons.Taskmaster.Job.explicit_stack_size = options.stack_size
 
     # Hash format and chunksize are set late to support SetOption being called
     # in a SConscript or SConstruct file.
@@ -1321,7 +1321,7 @@ def _build_targets(fs, options, targets, target_top):
     # to check if python configured with threads.
     global num_jobs
     num_jobs = options.num_jobs
-    jobs = SCons.Job.Jobs(num_jobs, taskmaster)
+    jobs = SCons.Taskmaster.Job.Jobs(num_jobs, taskmaster)
     if num_jobs > 1:
         msg = None
         if jobs.num_jobs == 1 or not python_has_threads:
diff --git a/SCons/Job.py b/SCons/Taskmaster/Job.py
index b398790..b398790 100644
--- a/SCons/Job.py
+++ b/SCons/Taskmaster/Job.py
diff --git a/SCons/JobTests.py b/SCons/Taskmaster/JobTests.py
index 54d7fa4..374d3f3 100644
--- a/SCons/JobTests.py
+++ b/SCons/Taskmaster/JobTests.py
@@ -25,12 +25,11 @@ import unittest
 import random
 import math
 import sys
-import time
 import os
 
 import TestUnit
 
-import SCons.Job
+import SCons.Taskmaster.Job
 
 
 def get_cpu_nums():
@@ -258,7 +257,7 @@ class ParallelTestCase(unittest.TestCase):
             raise NoThreadsException()
 
         taskmaster = Taskmaster(num_tasks, self, RandomTask)
-        jobs = SCons.Job.Jobs(num_jobs, taskmaster)
+        jobs = SCons.Taskmaster.Job.Jobs(num_jobs, taskmaster)
         jobs.run()
 
         self.assertTrue(not taskmaster.tasks_were_serial(),
@@ -284,7 +283,7 @@ class ParallelTestCase(unittest.TestCase):
                 time.sleep(0.01)
 
         global SaveThreadPool
-        SaveThreadPool = SCons.Job.ThreadPool
+        SaveThreadPool = SCons.Taskmaster.Job.ThreadPool
 
         class WaitThreadPool(SaveThreadPool):
             def put(self, task):
@@ -296,11 +295,11 @@ class ParallelTestCase(unittest.TestCase):
                 ThreadPoolCallList.append('get(%s)' % result[0].i)
                 return result
 
-        SCons.Job.ThreadPool = WaitThreadPool
+        SCons.Taskmaster.Job.ThreadPool = WaitThreadPool
 
         try:
             taskmaster = Taskmaster(3, self, SleepTask)
-            jobs = SCons.Job.Jobs(2, taskmaster)
+            jobs = SCons.Taskmaster.Job.Jobs(2, taskmaster)
             jobs.run()
 
             # The key here is that we get(1) and get(2) from the
@@ -314,14 +313,14 @@ class ParallelTestCase(unittest.TestCase):
             assert ThreadPoolCallList in expect, ThreadPoolCallList
 
         finally:
-            SCons.Job.ThreadPool = SaveThreadPool
+            SCons.Taskmaster.Job.ThreadPool = SaveThreadPool
 
 class SerialTestCase(unittest.TestCase):
     def runTest(self):
         """test a serial job"""
 
         taskmaster = Taskmaster(num_tasks, self, RandomTask)
-        jobs = SCons.Job.Jobs(1, taskmaster)
+        jobs = SCons.Taskmaster.Job.Jobs(1, taskmaster)
         jobs.run()
 
         self.assertTrue(taskmaster.tasks_were_serial(),
@@ -340,11 +339,11 @@ class NoParallelTestCase(unittest.TestCase):
         """test handling lack of parallel support"""
         def NoParallel(tm, num, stack_size):
             raise NameError
-        save_Parallel = SCons.Job.Parallel
-        SCons.Job.Parallel = NoParallel
+        save_Parallel = SCons.Taskmaster.Job.Parallel
+        SCons.Taskmaster.Job.Parallel = NoParallel
         try:
             taskmaster = Taskmaster(num_tasks, self, RandomTask)
-            jobs = SCons.Job.Jobs(2, taskmaster)
+            jobs = SCons.Taskmaster.Job.Jobs(2, taskmaster)
             self.assertTrue(jobs.num_jobs == 1,
                             "unexpected number of jobs %d" % jobs.num_jobs)
             jobs.run()
@@ -359,7 +358,7 @@ class NoParallelTestCase(unittest.TestCase):
             self.assertFalse(taskmaster.num_failed,
                         "some task(s) failed to execute")
         finally:
-            SCons.Job.Parallel = save_Parallel
+            SCons.Taskmaster.Job.Parallel = save_Parallel
 
 
 class SerialExceptionTestCase(unittest.TestCase):
@@ -367,7 +366,7 @@ class SerialExceptionTestCase(unittest.TestCase):
         """test a serial job with tasks that raise exceptions"""
 
         taskmaster = Taskmaster(num_tasks, self, ExceptionTask)
-        jobs = SCons.Job.Jobs(1, taskmaster)
+        jobs = SCons.Taskmaster.Job.Jobs(1, taskmaster)
         jobs.run()
 
         self.assertFalse(taskmaster.num_executed,
@@ -384,7 +383,7 @@ class ParallelExceptionTestCase(unittest.TestCase):
         """test parallel jobs with tasks that raise exceptions"""
 
         taskmaster = Taskmaster(num_tasks, self, ExceptionTask)
-        jobs = SCons.Job.Jobs(num_jobs, taskmaster)
+        jobs = SCons.Taskmaster.Job.Jobs(num_jobs, taskmaster)
         jobs.run()
 
         self.assertFalse(taskmaster.num_executed,
@@ -476,7 +475,7 @@ class _SConsTaskTest(unittest.TestCase):
         taskmaster = SCons.Taskmaster.Taskmaster(testnodes,
                                                  tasker=SCons.Taskmaster.AlwaysTask)
 
-        jobs = SCons.Job.Jobs(num_jobs, taskmaster)
+        jobs = SCons.Taskmaster.Job.Jobs(num_jobs, taskmaster)
 
         # Exceptions thrown by tasks are not actually propagated to
         # this level, but are instead stored in the Taskmaster.
diff --git a/SCons/TaskmasterTests.py b/SCons/Taskmaster/TaskmasterTests.py
index f20fd71..f20fd71 100644
--- a/SCons/TaskmasterTests.py
+++ b/SCons/Taskmaster/TaskmasterTests.py
diff --git a/SCons/Taskmaster.py b/SCons/Taskmaster/__init__.py
index d571795..d571795 100644
--- a/SCons/Taskmaster.py
+++ b/SCons/Taskmaster/__init__.py