From 6da5ce45b03c4120d90cad3e7ccb1808199611f6 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 10 Oct 2022 15:51:09 -0700 Subject: Fix references to SCons.Jobs -> SCons.Taskmaster.Jobs which weren't caught by pycharm refactoring --- SCons/Tool/ninja/Overrides.py | 2 +- SCons/Tool/ninja/__init__.py | 2 +- doc/sphinx/SCons.rst | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/SCons/Tool/ninja/Overrides.py b/SCons/Tool/ninja/Overrides.py index eb8dbb5..e98ec40 100644 --- a/SCons/Tool/ninja/Overrides.py +++ b/SCons/Tool/ninja/Overrides.py @@ -84,7 +84,7 @@ def ninja_always_serial(self, num, taskmaster): # builds. So here we lie so the Main.py will not give a false # warning to users. self.num_jobs = num - self.job = SCons.Job.Serial(taskmaster) + self.job = SCons.Taskmaster.Job.Serial(taskmaster) # pylint: disable=too-few-public-methods diff --git a/SCons/Tool/ninja/__init__.py b/SCons/Tool/ninja/__init__.py index f0bdee5..c4023c3 100644 --- a/SCons/Tool/ninja/__init__.py +++ b/SCons/Tool/ninja/__init__.py @@ -416,7 +416,7 @@ def generate(env): # The Serial job class is SIGNIFICANTLY (almost twice as) faster # than the Parallel job class for generating Ninja files. So we # monkey the Jobs constructor to only use the Serial Job class. - SCons.Job.Jobs.__init__ = ninja_always_serial + SCons.Taskmaster.Job.Jobs.__init__ = ninja_always_serial ninja_syntax = importlib.import_module(".ninja_syntax", package='ninja') diff --git a/doc/sphinx/SCons.rst b/doc/sphinx/SCons.rst index c6320e7..49fed4c 100644 --- a/doc/sphinx/SCons.rst +++ b/doc/sphinx/SCons.rst @@ -99,14 +99,6 @@ SCons.Executor module :undoc-members: :show-inheritance: -SCons.Job module ----------------- - -.. automodule:: SCons.Job - :members: - :undoc-members: - :show-inheritance: - SCons.Memoize module -------------------- -- cgit v0.12