Remove API module and import exceptions and global policy functions

5 files changed, 13 insertions, 57 deletions

diff --git a/SCons/Tool/MSCommon/MSVC/API.py b/SCons/Tool/MSCommon/MSVC/API.py
deleted file mode 100644
index cfa4195..0000000
--- a/SCons/Tool/MSCommon/MSVC/API.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# MIT License
-#
-# Copyright The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-"""
-Public API for Microsoft Visual C/C++.
-"""
-
-from .Exceptions import *  # noqa: F401
-from .Warnings import *  # noqa: F401
-
-from .Policy import set_msvc_notfound_policy  # noqa: F401
-from .Policy import get_msvc_notfound_policy  # noqa: F401
-
-from .Policy import set_msvc_scripterror_policy  # noqa: F401
-from .Policy import get_msvc_scripterror_policy  # noqa: F401
-
-from .Util import get_version_elements  # noqa: F401
-
diff --git a/SCons/Tool/MSCommon/MSVC/Exceptions.py b/SCons/Tool/MSCommon/MSVC/Exceptions.py
index 6a311d4..a12b3c6 100644
--- a/SCons/Tool/MSCommon/MSVC/Exceptions.py
+++ b/SCons/Tool/MSCommon/MSVC/Exceptions.py
@@ -25,17 +25,6 @@
 Exceptions for Microsoft Visual C/C++.
 """
 
-__all__ = [
-    'VisualCException',
-    'MSVCInternalError',
-    'MSVCScriptExecutionError',
-    'MSVCVersionNotFound',
-    'MSVCSDKVersionNotFound',
-    'MSVCToolsetVersionNotFound',
-    'MSVCSpectreLibsNotFound',
-    'MSVCArgumentError',
-]
-
 class VisualCException(Exception):
     pass
 
diff --git a/SCons/Tool/MSCommon/MSVC/Warnings.py b/SCons/Tool/MSCommon/MSVC/Warnings.py
index c4a0f15..cab5145 100644
--- a/SCons/Tool/MSCommon/MSVC/Warnings.py
+++ b/SCons/Tool/MSCommon/MSVC/Warnings.py
@@ -25,11 +25,6 @@
 Warnings for Microsoft Visual C/C++.
 """
 
-__all__ = [
-    'VisualCWarning',
-    'MSVCScriptExecutionWarning',
-]
-
 import SCons.Warnings
 
 class VisualCWarning(SCons.Warnings.WarningOnByDefault):
diff --git a/SCons/Tool/MSCommon/MSVC/__init__.py b/SCons/Tool/MSCommon/MSVC/__init__.py
index d73a7e1..04a6948 100644
--- a/SCons/Tool/MSCommon/MSVC/__init__.py
+++ b/SCons/Tool/MSCommon/MSVC/__init__.py
@@ -45,8 +45,6 @@ from . import Policy  # noqa: F401
 from . import WinSDK  # noqa: F401
 from . import ScriptArguments  # noqa: F401
 
-from . import API # noqa: F401
-
 from . import Dispatcher as _Dispatcher
 
 def _reset():
diff --git a/SCons/Tool/MSCommon/vc.py b/SCons/Tool/MSCommon/vc.py
index 4834b12..a21e09c 100644
--- a/SCons/Tool/MSCommon/vc.py
+++ b/SCons/Tool/MSCommon/vc.py
@@ -62,7 +62,19 @@ from .sdk import get_installed_sdks
 
 from . import MSVC
 
-from .MSVC.API import *
+from .MSVC.Policy import set_msvc_notfound_policy  # noqa: F401
+from .MSVC.Policy import get_msvc_notfound_policy  # noqa: F401
+from .MSVC.Policy import set_msvc_scripterror_policy  # noqa: F401
+from .MSVC.Policy import get_msvc_scripterror_policy  # noqa: F401
+
+from .MSVC.Exceptions import VisualCException
+from .MSVC.Exceptions import MSVCInternalError  # noqa: F401
+from .MSVC.Exceptions import MSVCScriptExecutionError  # noqa: F401
+from .MSVC.Exceptions import MSVCVersionNotFound  # noqa: F401
+from .MSVC.Exceptions import MSVCSDKVersionNotFound  # noqa: F401
+from .MSVC.Exceptions import MSVCToolsetVersionNotFound
+from .MSVC.Exceptions import MSVCSpectreLibsNotFound   # noqa: F401
+from .MSVC.Exceptions import MSVCArgumentError
 
 class UnsupportedVersion(VisualCException):
     pass