Remove pywin32 from scons win32 install requirements. Remove usage from SCons.Script.main

4 files changed, 3 insertions, 31 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 6ca145e..00315c7 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
   From William Deegan:
     - Fix yacc tool, not respecting YACC set at time of tool initialization.
     - Refactor SCons.Tool to move all common shared and loadable module linking logic to SCons.Tool.linkCommon
+    - Remove pywin32 imports from SCons.Script.Main. No longer needed.
+    - pywin32 no longer necessary for SCons install. (pip install SCons will no longer also require pywin32 on win32)
 
   From Michał Górny:
     - Fix dvipdf test failure due to passing incorrect flag to dvipdf.
diff --git a/SCons/Platform/win32.py b/SCons/Platform/win32.py
index 439cf64..aa76387 100644
--- a/SCons/Platform/win32.py
+++ b/SCons/Platform/win32.py
@@ -43,22 +43,6 @@ CHOCO_DEFAULT_PATH = [
     r'C:\ProgramData\chocolatey\bin'
 ]
 
-try:
-    import msvcrt
-    import win32api
-    import win32con
-except ImportError:
-    parallel_msg = \
-        "you do not seem to have the pywin32 extensions installed;\n" + \
-        "\tparallel (-j) builds may not work reliably with open Python files."
-except AttributeError:
-    parallel_msg = \
-        "your pywin32 extensions do not support file handle operations;\n" + \
-        "\tparallel (-j) builds may not work reliably with open Python files."
-else:
-    parallel_msg = None
-
-
 if False:
     # Now swap out shutil.filecopy and filecopy2 for win32 api native CopyFile
     try:
diff --git a/SCons/Script/Main.py b/SCons/Script/Main.py
index 2b9bb90..6c3ba06 100644
--- a/SCons/Script/Main.py
+++ b/SCons/Script/Main.py
@@ -80,17 +80,6 @@ num_jobs = None
 delayed_warnings = []
 
 
-def fetch_win32_parallel_msg():
-    # A subsidiary function that exists solely to isolate this import
-    # so we don't have to pull it in on all platforms, and so that an
-    # in-line "import" statement in the _main() function below doesn't
-    # cause warnings about local names shadowing use of the 'SCons'
-    # global in nest scopes and UnboundLocalErrors and the like in some
-    # versions (2.1) of Python.
-    import SCons.Platform.win32
-    return SCons.Platform.win32.parallel_msg
-
-
 def revert_io():
     # This call is added to revert stderr and stdout to the original
     # ones just in case some build rule or something else in the system
@@ -1288,9 +1277,7 @@ def _build_targets(fs, options, targets, target_top):
     jobs = SCons.Job.Jobs(num_jobs, taskmaster)
     if num_jobs > 1:
         msg = None
-        if sys.platform == 'win32':
-            msg = fetch_win32_parallel_msg()
-        elif jobs.num_jobs == 1 or not python_has_threads:
+        if jobs.num_jobs == 1 or not python_has_threads:
             msg = "parallel builds are unsupported by this version of Python;\n" + \
                   "\tignoring -j or num_jobs option.\n"
         if msg:
diff --git a/setup.cfg b/setup.cfg
index 1243fd2..a141c67 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -42,7 +42,6 @@ zip_safe = False
 python_requires = >=3.5
 install_requires =
     setuptools
-    pywin32 >= 1.0;platform_system=="Windows"
 
 setup_requires = setuptools
 include_package_data = True