summaryrefslogtreecommitdiff
path: root/SCons/Tool/MSCommon
diff options
context:
space:
mode:
Diffstat (limited to 'SCons/Tool/MSCommon')
-rw-r--r--SCons/Tool/MSCommon/MSVC/ConfigTests.py10
-rw-r--r--SCons/Tool/MSCommon/MSVC/Dispatcher.py8
-rw-r--r--SCons/Tool/MSCommon/MSVC/DispatcherTests.py24
-rw-r--r--SCons/Tool/MSCommon/MSVC/PolicyTests.py30
-rw-r--r--SCons/Tool/MSCommon/MSVC/Registry.py8
-rw-r--r--SCons/Tool/MSCommon/MSVC/RegistryTests.py14
-rw-r--r--SCons/Tool/MSCommon/MSVC/ScriptArguments.py22
-rw-r--r--SCons/Tool/MSCommon/MSVC/ScriptArgumentsTests.py26
-rw-r--r--SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py10
-rw-r--r--SCons/Tool/MSCommon/MSVC/UtilTests.py20
-rw-r--r--SCons/Tool/MSCommon/MSVC/WinSDK.py10
-rw-r--r--SCons/Tool/MSCommon/MSVC/WinSDKTests.py24
-rw-r--r--SCons/Tool/MSCommon/MSVC/__init__.py4
-rw-r--r--SCons/Tool/MSCommon/arch.py2
-rw-r--r--SCons/Tool/MSCommon/common.py8
-rw-r--r--SCons/Tool/MSCommon/sdk.py8
-rw-r--r--SCons/Tool/MSCommon/vc.py14
-rw-r--r--SCons/Tool/MSCommon/vcTests.py52
-rw-r--r--SCons/Tool/MSCommon/vs.py10
19 files changed, 152 insertions, 152 deletions
diff --git a/SCons/Tool/MSCommon/MSVC/ConfigTests.py b/SCons/Tool/MSCommon/MSVC/ConfigTests.py
index 89db6cda5..cbd811e45 100644
--- a/SCons/Tool/MSCommon/MSVC/ConfigTests.py
+++ b/SCons/Tool/MSCommon/MSVC/ConfigTests.py
@@ -44,7 +44,7 @@ class Patch:
return hook
@classmethod
- def restore(cls):
+ def restore(cls) -> None:
vc._VCVER = cls._VCVER
class Config:
@@ -58,13 +58,13 @@ class Patch:
return hook
@classmethod
- def restore(cls):
+ def restore(cls) -> None:
Config.MSVC_VERSION_INTERNAL = cls.MSVC_VERSION_INTERNAL
class ConfigTests(unittest.TestCase):
- def test_vcver(self):
+ def test_vcver(self) -> None:
# all vc._VCVER in Config.MSVC_VERSION_SUFFIX
_VCVER = Patch.vc._VCVER.enable_copy()
_VCVER.append('99.9')
@@ -72,7 +72,7 @@ class ConfigTests(unittest.TestCase):
Config.verify()
Patch.vc._VCVER.restore()
- def test_msvc_version_internal(self):
+ def test_msvc_version_internal(self) -> None:
# all vc._VCVER numstr in Config.MSVC_VERSION_INTERNAL
MSVC_VERSION_INTERNAL = Patch.Config.MSVC_VERSION_INTERNAL.enable_copy()
del MSVC_VERSION_INTERNAL['14.3']
@@ -80,7 +80,7 @@ class ConfigTests(unittest.TestCase):
Config.verify()
Patch.Config.MSVC_VERSION_INTERNAL.restore()
- def test_verify(self):
+ def test_verify(self) -> None:
Config.verify()
diff --git a/SCons/Tool/MSCommon/MSVC/Dispatcher.py b/SCons/Tool/MSCommon/MSVC/Dispatcher.py
index 42b5287b0..31233a969 100644
--- a/SCons/Tool/MSCommon/MSVC/Dispatcher.py
+++ b/SCons/Tool/MSCommon/MSVC/Dispatcher.py
@@ -53,16 +53,16 @@ from ..common import (
_refs = []
-def register_modulename(modname):
+def register_modulename(modname) -> None:
module = sys.modules[modname]
_refs.append(module)
-def register_class(ref):
+def register_class(ref) -> None:
_refs.append(ref)
-def reset():
+def reset() -> None:
debug('')
for ref in _refs:
for method in ['reset', '_reset']:
@@ -73,7 +73,7 @@ def reset():
func()
-def verify():
+def verify() -> None:
debug('')
for ref in _refs:
for method in ['verify', '_verify']:
diff --git a/SCons/Tool/MSCommon/MSVC/DispatcherTests.py b/SCons/Tool/MSCommon/MSVC/DispatcherTests.py
index d6af8d464..61ea3f12f 100644
--- a/SCons/Tool/MSCommon/MSVC/DispatcherTests.py
+++ b/SCons/Tool/MSCommon/MSVC/DispatcherTests.py
@@ -46,37 +46,37 @@ verify = None
class StaticMethods:
@staticmethod
- def _reset():
+ def _reset() -> None:
Data.reset_count += 1
@staticmethod
- def reset():
+ def reset() -> None:
Data.reset_count += 1
@staticmethod
- def _verify():
+ def _verify() -> None:
Data.verify_count += 1
@staticmethod
- def verify():
+ def verify() -> None:
Data.verify_count += 1
class ClassMethods:
@classmethod
- def _reset(cls):
+ def _reset(cls) -> None:
Data.reset_count += 1
@classmethod
- def reset(cls):
+ def reset(cls) -> None:
Data.reset_count += 1
@classmethod
- def _verify(cls):
+ def _verify(cls) -> None:
Data.verify_count += 1
@classmethod
- def verify(cls):
+ def verify(cls) -> None:
Data.verify_count += 1
@@ -94,22 +94,22 @@ MSVC.Dispatcher.register_class(NotCallable)
class DispatcherTests(unittest.TestCase):
- def test_dispatcher_reset(self):
+ def test_dispatcher_reset(self) -> None:
MSVC.Dispatcher.reset()
self.assertTrue(Data.reset_count == 4, "MSVC.Dispatcher.reset() count failed")
Data.reset_count = 0
- def test_dispatcher_verify(self):
+ def test_dispatcher_verify(self) -> None:
MSVC.Dispatcher.verify()
self.assertTrue(Data.verify_count == 4, "MSVC.Dispatcher.verify() count failed")
Data.verify_count = 0
- def test_msvc_reset(self):
+ def test_msvc_reset(self) -> None:
MSVC._reset()
self.assertTrue(Data.reset_count == 4, "MSVC._reset() count failed")
Data.reset_count = 0
- def test_msvc_verify(self):
+ def test_msvc_verify(self) -> None:
MSVC._verify()
self.assertTrue(Data.verify_count == 4, "MSVC._verify() count failed")
Data.verify_count = 0
diff --git a/SCons/Tool/MSCommon/MSVC/PolicyTests.py b/SCons/Tool/MSCommon/MSVC/PolicyTests.py
index 013fd477d..a312d1191 100644
--- a/SCons/Tool/MSCommon/MSVC/PolicyTests.py
+++ b/SCons/Tool/MSCommon/MSVC/PolicyTests.py
@@ -43,22 +43,22 @@ from SCons.Tool.MSCommon.MSVC.Warnings import (
class PolicyTests(unittest.TestCase):
- def setUp(self):
+ def setUp(self) -> None:
self.warnstack = []
- def push_warning_as_exception(self, warning_class):
+ def push_warning_as_exception(self, warning_class) -> None:
SCons.Warnings.enableWarningClass(warning_class)
prev_state = SCons.Warnings.warningAsException()
self.warnstack.append((warning_class, prev_state))
- def pop_warning_as_exception(self):
+ def pop_warning_as_exception(self) -> None:
warning_class, prev_state = self.warnstack.pop()
SCons.Warnings.warningAsException(prev_state)
SCons.Warnings.suppressWarningClass(warning_class)
# msvc_set_notfound_policy, msvc_get_notfound_policy, and MSVC_NOTFOUND_POLICY
- def test_notfound_func_valid_symbols(self):
+ def test_notfound_func_valid_symbols(self) -> None:
def_policy = Policy.msvc_get_notfound_policy()
last_policy = def_policy
for notfound_def in Policy.MSVC_NOTFOUND_DEFINITION_LIST:
@@ -75,21 +75,21 @@ class PolicyTests(unittest.TestCase):
last_policy = cur_get_policy
Policy.msvc_set_notfound_policy(def_policy)
- def test_notfound_func_invalid_symbol(self):
+ def test_notfound_func_invalid_symbol(self) -> None:
with self.assertRaises(MSVCArgumentError):
Policy.msvc_set_notfound_policy('Undefined')
- def test_notfound_handler_invalid_symbol(self):
+ def test_notfound_handler_invalid_symbol(self) -> None:
with self.assertRaises(MSVCArgumentError):
Policy.msvc_notfound_handler({'MSVC_NOTFOUND_POLICY': 'Undefined'}, '')
- def test_notfound_handler_ignore(self):
+ def test_notfound_handler_ignore(self) -> None:
def_policy = Policy.msvc_set_notfound_policy('Ignore')
Policy.msvc_notfound_handler(None, '')
Policy.msvc_notfound_handler({'MSVC_NOTFOUND_POLICY': None}, '')
Policy.msvc_set_notfound_policy(def_policy)
- def test_notfound_handler_warning(self):
+ def test_notfound_handler_warning(self) -> None:
# treat warning as exception for testing
self.push_warning_as_exception(SCons.Warnings.VisualCMissingWarning)
def_policy = Policy.msvc_set_notfound_policy('Warning')
@@ -101,7 +101,7 @@ class PolicyTests(unittest.TestCase):
Policy.msvc_set_notfound_policy(def_policy)
self.pop_warning_as_exception()
- def test_notfound_handler_error(self):
+ def test_notfound_handler_error(self) -> None:
def_policy = Policy.msvc_set_notfound_policy('Error')
with self.assertRaises(MSVCVersionNotFound):
Policy.msvc_notfound_handler(None, '')
@@ -112,7 +112,7 @@ class PolicyTests(unittest.TestCase):
# msvc_set_scripterror_policy, msvc_get_scripterror_policy, and MSVC_SCRIPTERROR_POLICY
- def test_scripterror_func_valid_symbols(self):
+ def test_scripterror_func_valid_symbols(self) -> None:
def_policy = Policy.msvc_get_scripterror_policy()
last_policy = def_policy
for scripterror_def in Policy.MSVC_SCRIPTERROR_DEFINITION_LIST:
@@ -129,21 +129,21 @@ class PolicyTests(unittest.TestCase):
last_policy = cur_get_policy
Policy.msvc_set_scripterror_policy(def_policy)
- def test_scripterror_func_invalid_symbol(self):
+ def test_scripterror_func_invalid_symbol(self) -> None:
with self.assertRaises(MSVCArgumentError):
Policy.msvc_set_scripterror_policy('Undefined')
- def test_scripterror_handler_invalid_symbol(self):
+ def test_scripterror_handler_invalid_symbol(self) -> None:
with self.assertRaises(MSVCArgumentError):
Policy.msvc_scripterror_handler({'MSVC_SCRIPTERROR_POLICY': 'Undefined'}, '')
- def test_scripterror_handler_ignore(self):
+ def test_scripterror_handler_ignore(self) -> None:
def_policy = Policy.msvc_set_scripterror_policy('Ignore')
Policy.msvc_scripterror_handler(None, '')
Policy.msvc_scripterror_handler({'MSVC_SCRIPTERROR_POLICY': None}, '')
Policy.msvc_set_scripterror_policy(def_policy)
- def test_scripterror_handler_warning(self):
+ def test_scripterror_handler_warning(self) -> None:
# treat warning as exception for testing
self.push_warning_as_exception(MSVCScriptExecutionWarning)
def_policy = Policy.msvc_set_scripterror_policy('Warning')
@@ -155,7 +155,7 @@ class PolicyTests(unittest.TestCase):
Policy.msvc_set_scripterror_policy(def_policy)
self.pop_warning_as_exception()
- def test_scripterror_handler_error(self):
+ def test_scripterror_handler_error(self) -> None:
def_policy = Policy.msvc_set_scripterror_policy('Error')
with self.assertRaises(MSVCScriptExecutionError):
Policy.msvc_scripterror_handler(None, '')
diff --git a/SCons/Tool/MSCommon/MSVC/Registry.py b/SCons/Tool/MSCommon/MSVC/Registry.py
index 9519e1553..eee20ccbc 100644
--- a/SCons/Tool/MSCommon/MSVC/Registry.py
+++ b/SCons/Tool/MSCommon/MSVC/Registry.py
@@ -46,7 +46,7 @@ Dispatcher.register_modulename(__name__)
# A null-terminated string that contains unexpanded references to environment variables.
REG_EXPAND_SZ = 2
-def read_value(hkey, subkey_valname, expand=True):
+def read_value(hkey, subkey_valname, expand: bool=True):
try:
rval_t = RegGetValue(hkey, subkey_valname)
except OSError:
@@ -58,7 +58,7 @@ def read_value(hkey, subkey_valname, expand=True):
debug('hkey=%s, subkey=%s, rval=%s', repr(hkey), repr(subkey_valname), repr(rval))
return rval
-def registry_query_path(key, val, suffix, expand=True):
+def registry_query_path(key, val, suffix, expand: bool=True):
extval = val + '\\' + suffix if suffix else val
qpath = read_value(key, extval, expand=expand)
if qpath and os.path.exists(qpath):
@@ -74,7 +74,7 @@ REG_SOFTWARE_MICROSOFT = [
(HKEY_CURRENT_USER, r'Software\Microsoft'),
]
-def microsoft_query_paths(suffix, usrval=None, expand=True):
+def microsoft_query_paths(suffix, usrval=None, expand: bool=True):
paths = []
records = []
for key, val in REG_SOFTWARE_MICROSOFT:
@@ -87,7 +87,7 @@ def microsoft_query_paths(suffix, usrval=None, expand=True):
records.append((qpath, key, val, extval, usrval))
return records
-def microsoft_query_keys(suffix, usrval=None, expand=True):
+def microsoft_query_keys(suffix, usrval=None, expand: bool=True):
records = []
for key, val in REG_SOFTWARE_MICROSOFT:
extval = val + '\\' + suffix if suffix else val
diff --git a/SCons/Tool/MSCommon/MSVC/RegistryTests.py b/SCons/Tool/MSCommon/MSVC/RegistryTests.py
index aff3b3f99..9c9ef89a0 100644
--- a/SCons/Tool/MSCommon/MSVC/RegistryTests.py
+++ b/SCons/Tool/MSCommon/MSVC/RegistryTests.py
@@ -37,7 +37,7 @@ class RegistryTests(unittest.TestCase):
_sdk_versions = None
@classmethod
- def setUpClass(cls):
+ def setUpClass(cls) -> None:
cls._sdk_versions = []
sdk_seen = set()
for vs_def in Config.VISUALSTUDIO_DEFINITION_LIST:
@@ -49,24 +49,24 @@ class RegistryTests(unittest.TestCase):
sdk_seen.add(sdk_version)
cls._sdk_versions.append(sdk_version)
- def setUp(self):
+ def setUp(self) -> None:
self.sdk_versions = self.__class__._sdk_versions
- def test_sdk_query_paths(self):
+ def test_sdk_query_paths(self) -> None:
for sdk_version in self.sdk_versions:
_ = Registry.sdk_query_paths(sdk_version)
- def test_vstudio_sxs_vc7(self):
+ def test_vstudio_sxs_vc7(self) -> None:
suffix = Registry.vstudio_sxs_vc7('14.0')
_ = Registry.microsoft_query_paths(suffix)
- def test_microsoft_query_keys(self):
+ def test_microsoft_query_keys(self) -> None:
val = r'SYSTEM\CurrentControlSet\Control\Session Manager\Environment'
for suffix in ['Temp', 'Tmp']:
_ = Registry.registry_query_path(Registry.HKEY_LOCAL_MACHINE, val, suffix, expand=True)
_ = Registry.registry_query_path(Registry.HKEY_LOCAL_MACHINE, val, suffix, expand=False)
- def test_registry_query_path(self):
+ def test_registry_query_path(self) -> None:
# need a better test for when VS2015 is no longer installed
for component_reg in ('enterprise', 'professional', 'community'):
suffix = Registry.devdiv_vs_servicing_component('14.0', component_reg)
@@ -74,7 +74,7 @@ class RegistryTests(unittest.TestCase):
if not rval:
continue
- def test_windows_kit_query_paths(self):
+ def test_windows_kit_query_paths(self) -> None:
for sdk_version in self.sdk_versions:
_ = Registry.windows_kit_query_paths(sdk_version)
diff --git a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
index 57dbf9d3f..a5ceb332f 100644
--- a/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
+++ b/SCons/Tool/MSCommon/MSVC/ScriptArguments.py
@@ -107,12 +107,12 @@ _MSVC_FORCE_DEFAULT_TOOLSET = False
# Force default arguments
_MSVC_FORCE_DEFAULT_ARGUMENTS = False
-def _msvc_force_default_sdk(force=True):
+def _msvc_force_default_sdk(force: bool=True) -> None:
global _MSVC_FORCE_DEFAULT_SDK
_MSVC_FORCE_DEFAULT_SDK = force
debug('_MSVC_FORCE_DEFAULT_SDK=%s', repr(force))
-def _msvc_force_default_toolset(force=True):
+def _msvc_force_default_toolset(force: bool=True) -> None:
global _MSVC_FORCE_DEFAULT_TOOLSET
_MSVC_FORCE_DEFAULT_TOOLSET = force
debug('_MSVC_FORCE_DEFAULT_TOOLSET=%s', repr(force))
@@ -227,7 +227,7 @@ def _msvc_script_argument_uwp(env, msvc, arglist):
return uwp_arg
-def _user_script_argument_uwp(env, uwp, user_argstr):
+def _user_script_argument_uwp(env, uwp, user_argstr) -> bool:
matches = [m for m in re_vcvars_uwp.finditer(user_argstr)]
if not matches:
@@ -331,7 +331,7 @@ def _msvc_script_argument_sdk(env, msvc, toolset, platform_def, arglist):
return sdk_version
-def _msvc_script_default_sdk(env, msvc, platform_def, arglist, force_sdk=False):
+def _msvc_script_default_sdk(env, msvc, platform_def, arglist, force_sdk: bool=False):
if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2015.vc_buildtools_def.vc_version_numeric:
return None
@@ -390,7 +390,7 @@ def _msvc_have140_toolset():
return _toolset_have140_cache
-def _reset_have140_cache():
+def _reset_have140_cache() -> None:
global _toolset_have140_cache
debug('reset: cache')
_toolset_have140_cache = None
@@ -520,7 +520,7 @@ def _msvc_read_toolset_default(msvc, vc_dir):
_toolset_version_cache = {}
_toolset_default_cache = {}
-def _reset_toolset_cache():
+def _reset_toolset_cache() -> None:
global _toolset_version_cache
global _toolset_default_cache
debug('reset: toolset cache')
@@ -686,7 +686,7 @@ def _msvc_script_argument_toolset(env, msvc, vc_dir, arglist):
return toolset_vcvars
-def _msvc_script_default_toolset(env, msvc, vc_dir, arglist, force_toolset=False):
+def _msvc_script_default_toolset(env, msvc, vc_dir, arglist, force_toolset: bool=False):
if msvc.vs_def.vc_buildtools_def.vc_version_numeric < VS2017.vc_buildtools_def.vc_version_numeric:
return None
@@ -853,7 +853,7 @@ def _msvc_script_argument_user(env, msvc, arglist):
return script_args
-def _msvc_process_construction_variables(env):
+def _msvc_process_construction_variables(env) -> bool:
for cache_variable in [
_MSVC_FORCE_DEFAULT_TOOLSET,
@@ -982,7 +982,7 @@ def _msvc_toolset_internal(msvc_version, toolset_version, vc_dir):
return toolset_vcvars
-def _msvc_toolset_versions_internal(msvc_version, vc_dir, full=True, sxs=False):
+def _msvc_toolset_versions_internal(msvc_version, vc_dir, full: bool=True, sxs: bool=False):
msvc = _msvc_version(msvc_version)
@@ -1020,12 +1020,12 @@ def _msvc_toolset_versions_spectre_internal(msvc_version, vc_dir):
return spectre_toolset_versions
-def reset():
+def reset() -> None:
debug('')
_reset_have140_cache()
_reset_toolset_cache()
-def verify():
+def verify() -> None:
debug('')
_verify_re_sdk_dispatch_map()
diff --git a/SCons/Tool/MSCommon/MSVC/ScriptArgumentsTests.py b/SCons/Tool/MSCommon/MSVC/ScriptArgumentsTests.py
index 441325653..670576b04 100644
--- a/SCons/Tool/MSCommon/MSVC/ScriptArgumentsTests.py
+++ b/SCons/Tool/MSCommon/MSVC/ScriptArgumentsTests.py
@@ -147,13 +147,13 @@ class Data:
)
@classmethod
- def msvc_sdk_version_list_components(cls, msvc_version, msvc_uwp_app=False):
+ def msvc_sdk_version_list_components(cls, msvc_version, msvc_uwp_app: bool=False):
comps_dict = cls.SDK_VERSIONS_COMPS_DICT.get(msvc_version, {})
comps_list = comps_dict.get(msvc_uwp_app, [])
return comps_list
@classmethod
- def msvc_sdk_version(cls, msvc_version, msvc_uwp_app=False):
+ def msvc_sdk_version(cls, msvc_version, msvc_uwp_app: bool=False):
comps_dict = cls.SDK_VERSIONS_COMPS_DICT.get(msvc_version, {})
comps_list = comps_dict.get(msvc_uwp_app, [])
if not comps_list:
@@ -163,7 +163,7 @@ class Data:
return sdk_version
@classmethod
- def msvc_sdk_notfound_version(cls, msvc_version, msvc_uwp_app=False):
+ def msvc_sdk_notfound_version(cls, msvc_version, msvc_uwp_app: bool=False):
notfound_dict = cls.SDK_VERSIONS_NOTFOUND_DICT.get(msvc_version, {})
notfound_list = notfound_dict.get(msvc_uwp_app, [])
if not notfound_list:
@@ -201,19 +201,19 @@ class Patch:
return hook
@classmethod
- def restore(cls):
+ def restore(cls) -> None:
Config.MSVC_SDK_VERSIONS = cls.MSVC_SDK_VERSIONS
class ScriptArgumentsTests(unittest.TestCase):
- def test_verify(self):
+ def test_verify(self) -> None:
MSVC_SDK_VERSIONS = Patch.Config.MSVC_SDK_VERSIONS.enable_copy()
MSVC_SDK_VERSIONS.add('99.0')
with self.assertRaises(MSVCInternalError):
ScriptArguments.verify()
Patch.Config.MSVC_SDK_VERSIONS.restore()
- def test_msvc_script_arguments_defaults(self):
+ def test_msvc_script_arguments_defaults(self) -> None:
func = ScriptArguments.msvc_script_arguments
env = Environment()
# disable forcing sdk and toolset versions as arguments
@@ -244,7 +244,7 @@ class ScriptArgumentsTests(unittest.TestCase):
# restore forcing sdk and toolset versions as arguments
ScriptArguments.msvc_force_default_arguments(force=force)
- def test_msvc_toolset_versions_internal(self):
+ def test_msvc_toolset_versions_internal(self) -> None:
func = ScriptArguments._msvc_toolset_versions_internal
for version_def, vc_dir in Data.INSTALLED_VERSIONS_PAIRS:
for full in (True, False):
@@ -267,7 +267,7 @@ class ScriptArgumentsTests(unittest.TestCase):
func.__name__, repr(version_def.msvc_version), repr(vc_dir), repr(full), repr(sxs)
))
- def test_msvc_toolset_internal(self):
+ def test_msvc_toolset_internal(self) -> None:
if not Data.HAVE_MSVC:
return
func = ScriptArguments._msvc_toolset_internal
@@ -278,7 +278,7 @@ class ScriptArgumentsTests(unittest.TestCase):
for toolset_version in toolset_versions:
_ = func(version_def.msvc_version, toolset_version, vc_dir)
- def run_msvc_script_args_none(self):
+ def run_msvc_script_args_none(self) -> None:
func = ScriptArguments.msvc_script_arguments
for version_def, vc_dir in Data.INSTALLED_VERSIONS_PAIRS:
for kwargs in [
@@ -291,7 +291,7 @@ class ScriptArgumentsTests(unittest.TestCase):
env = Environment(**kwargs)
_ = func(env, version_def.msvc_version, vc_dir, '')
- def run_msvc_script_args(self):
+ def run_msvc_script_args(self) -> None:
func = ScriptArguments.msvc_script_arguments
for version_def, vc_dir in Data.INSTALLED_VERSIONS_PAIRS:
if version_def.msvc_vernum >= 14.1:
@@ -565,7 +565,7 @@ class ScriptArgumentsTests(unittest.TestCase):
with self.assertRaises(MSVCArgumentError):
_ = func(env, version_def.msvc_version, vc_dir, '')
- def test_msvc_script_args_none(self):
+ def test_msvc_script_args_none(self) -> None:
force = ScriptArguments.msvc_force_default_arguments(force=False)
self.run_msvc_script_args_none()
if Data.HAVE_MSVC:
@@ -573,14 +573,14 @@ class ScriptArgumentsTests(unittest.TestCase):
self.run_msvc_script_args_none()
ScriptArguments.msvc_force_default_arguments(force=force)
- def test_msvc_script_args(self):
+ def test_msvc_script_args(self) -> None:
force = ScriptArguments.msvc_force_default_arguments(force=False)
self.run_msvc_script_args()
ScriptArguments.msvc_force_default_arguments(force=True)
self.run_msvc_script_args()
ScriptArguments.msvc_force_default_arguments(force=force)
- def test_reset(self):
+ def test_reset(self) -> None:
ScriptArguments.reset()
self.assertTrue(ScriptArguments._toolset_have140_cache is None, "ScriptArguments._toolset_have140_cache was not reset")
self.assertFalse(ScriptArguments._toolset_version_cache, "ScriptArguments._toolset_version_cache was not reset")
diff --git a/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py b/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py
index e1c05bc1b..34e60ab19 100644
--- a/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py
+++ b/SCons/Tool/MSCommon/MSVC/SetupEnvDefault.py
@@ -54,7 +54,7 @@ class _Data:
need_init = True
@classmethod
- def reset(cls):
+ def reset(cls) -> None:
debug('msvc default:init')
cls.n_setup = 0 # number of calls to msvc_setup_env_once
cls.default_ismsvc = False # is msvc the default compiler
@@ -65,7 +65,7 @@ class _Data:
cls.msvc_nodefault = False # is there a default version of msvc
cls.need_init = True # reset initialization indicator
-def _initialize(env, msvc_exists_func):
+def _initialize(env, msvc_exists_func) -> None:
if _Data.need_init:
_Data.reset()
_Data.need_init = False
@@ -88,7 +88,7 @@ def register_tool(env, tool, msvc_exists_func):
_Data.msvc_tools.add(tool)
debug('msvc default:tool=%s, msvc_tools=%s', tool, _Data.msvc_tools)
-def register_setup(env, msvc_exists_func):
+def register_setup(env, msvc_exists_func) -> None:
if _Data.need_init:
_initialize(env, msvc_exists_func)
_Data.n_setup += 1
@@ -106,7 +106,7 @@ def register_setup(env, msvc_exists_func):
_Data.n_setup, _Data.msvc_installed, _Data.default_ismsvc
)
-def set_nodefault():
+def set_nodefault() -> None:
# default msvc version, msvc not installed
_Data.msvc_nodefault = True
debug('msvc default:msvc_nodefault=%s', _Data.msvc_nodefault)
@@ -227,7 +227,7 @@ def register_iserror(env, tool, msvc_exists_func):
# return tool list in order presented
return tools_found_list
-def reset():
+def reset() -> None:
debug('')
_Data.reset()
diff --git a/SCons/Tool/MSCommon/MSVC/UtilTests.py b/SCons/Tool/MSCommon/MSVC/UtilTests.py
index 5e14d506d..36e08f5eb 100644
--- a/SCons/Tool/MSCommon/MSVC/UtilTests.py
+++ b/SCons/Tool/MSCommon/MSVC/UtilTests.py
@@ -39,7 +39,7 @@ class Data:
class UtilTests(unittest.TestCase):
- def test_listdir_dirs(self):
+ def test_listdir_dirs(self) -> None:
func = Util.listdir_dirs
for dirname, expect in [
(None, False), ('', False), ('doesnotexist.xyz.abc', False),
@@ -50,7 +50,7 @@ class UtilTests(unittest.TestCase):
func.__name__, repr(dirname), 'list is empty' if expect else 'list is not empty'
))
- def test_process_path(self):
+ def test_process_path(self) -> None:
func = Util.process_path
for p, expect in [
(None, True), ('', True),
@@ -61,7 +61,7 @@ class UtilTests(unittest.TestCase):
func.__name__, repr(p), repr(rval)
))
- def test_get_version_prefix(self):
+ def test_get_version_prefix(self) -> None:
func = Util.get_version_prefix
for version, expect in [
(None, ''), ('', ''),
@@ -76,7 +76,7 @@ class UtilTests(unittest.TestCase):
func.__name__, repr(version), repr(prefix), repr(expect)
))
- def test_get_msvc_version_prefix(self):
+ def test_get_msvc_version_prefix(self) -> None:
func = Util.get_msvc_version_prefix
for version, expect in [
(None, ''), ('', ''),
@@ -91,7 +91,7 @@ class UtilTests(unittest.TestCase):
func.__name__, repr(version), repr(prefix), repr(expect)
))
- def test_is_toolset_full(self):
+ def test_is_toolset_full(self) -> None:
func = Util.is_toolset_full
for toolset, expect in [
(None, False), ('', False),
@@ -103,7 +103,7 @@ class UtilTests(unittest.TestCase):
func.__name__, repr(toolset), repr(rval)
))
- def test_is_toolset_140(self):
+ def test_is_toolset_140(self) -> None:
func = Util.is_toolset_140
for toolset, expect in [
(None, False), ('', False),
@@ -115,7 +115,7 @@ class UtilTests(unittest.TestCase):
func.__name__, repr(toolset), repr(rval)
))
- def test_is_toolset_sxs(self):
+ def test_is_toolset_sxs(self) -> None:
func = Util.is_toolset_sxs
for toolset, expect in [
(None, False), ('', False),
@@ -127,7 +127,7 @@ class UtilTests(unittest.TestCase):
func.__name__, repr(toolset), repr(rval)
))
- def test_msvc_version_components(self):
+ def test_msvc_version_components(self) -> None:
func = Util.msvc_version_components
for vcver, expect in [
(None, False), ('', False), ('ABC', False), ('14', False), ('14.1.', False), ('14.16', False),
@@ -145,7 +145,7 @@ class UtilTests(unittest.TestCase):
func.__name__, repr(vcver)
))
- def test_msvc_extended_version_components(self):
+ def test_msvc_extended_version_components(self) -> None:
func = Util.msvc_extended_version_components
# normal code paths
for vcver, expect in [
@@ -184,7 +184,7 @@ class UtilTests(unittest.TestCase):
))
Util.re_extended_version = save_re
- def test_msvc_sdk_version_components(self):
+ def test_msvc_sdk_version_components(self) -> None:
func = Util.msvc_sdk_version_components
for vcver, expect in [
(None, False), ('', False), ('ABC', False), ('14', False), ('14.1.', False), ('14.16', False),
diff --git a/SCons/Tool/MSCommon/MSVC/WinSDK.py b/SCons/Tool/MSCommon/MSVC/WinSDK.py
index 6d18d0730..a5a48c465 100644
--- a/SCons/Tool/MSCommon/MSVC/WinSDK.py
+++ b/SCons/Tool/MSCommon/MSVC/WinSDK.py
@@ -154,7 +154,7 @@ def _sdk_81_layout(version):
_sdk_map_cache = {}
_sdk_cache = {}
-def _reset_sdk_cache():
+def _reset_sdk_cache() -> None:
global _sdk_map_cache
global _sdk_cache
debug('')
@@ -220,7 +220,7 @@ def _sdk_map(version_list):
_sdk_cache[key] = sdk_map
return sdk_map
-def get_msvc_platform(is_uwp=False):
+def get_msvc_platform(is_uwp: bool=False):
platform_def = _UWP if is_uwp else _DESKTOP
return platform_def
@@ -230,7 +230,7 @@ def get_sdk_version_list(vs_def, platform_def):
sdk_list = sdk_map.get(platform_def.vc_platform, [])
return sdk_list
-def get_msvc_sdk_version_list(msvc_version, msvc_uwp_app=False):
+def get_msvc_sdk_version_list(msvc_version, msvc_uwp_app: bool=False):
debug('msvc_version=%s, msvc_uwp_app=%s', repr(msvc_version), repr(msvc_uwp_app))
sdk_versions = []
@@ -254,11 +254,11 @@ def get_msvc_sdk_version_list(msvc_version, msvc_uwp_app=False):
return sdk_versions
-def reset():
+def reset() -> None:
debug('')
_reset_sdk_cache()
-def verify():
+def verify() -> None:
debug('')
_verify_sdk_dispatch_map()
diff --git a/SCons/Tool/MSCommon/MSVC/WinSDKTests.py b/SCons/Tool/MSCommon/MSVC/WinSDKTests.py
index 2a40e9a68..10e68f3d6 100644
--- a/SCons/Tool/MSCommon/MSVC/WinSDKTests.py
+++ b/SCons/Tool/MSCommon/MSVC/WinSDKTests.py
@@ -47,7 +47,7 @@ class Patch:
return hook
@classmethod
- def restore(cls):
+ def restore(cls) -> None:
Config.MSVC_SDK_VERSIONS = cls.MSVC_SDK_VERSIONS
class Registry:
@@ -69,54 +69,54 @@ class Patch:
return hook
@classmethod
- def restore(cls):
+ def restore(cls) -> None:
Registry.sdk_query_paths = cls.sdk_query_paths
class WinSDKTests(unittest.TestCase):
@classmethod
- def setUpClass(cls):
+ def setUpClass(cls) -> None:
Patch.Registry.sdk_query_paths.enable_duplicate()
@classmethod
- def tearDownClass(cls):
+ def tearDownClass(cls) -> None:
Patch.Registry.sdk_query_paths.restore()
- def test_verify(self):
+ def test_verify(self) -> None:
MSVC_SDK_VERSIONS = Patch.Config.MSVC_SDK_VERSIONS.enable_copy()
MSVC_SDK_VERSIONS.add('99.0')
with self.assertRaises(MSVCInternalError):
WinSDK.verify()
Patch.Config.MSVC_SDK_VERSIONS.restore()
- def _run_reset(self):
+ def _run_reset(self) -> None:
WinSDK.reset()
self.assertFalse(WinSDK._sdk_map_cache, "WinSDK._sdk_map_cache was not reset")
self.assertFalse(WinSDK._sdk_cache, "WinSDK._sdk_cache was not reset")
- def _run_get_msvc_sdk_version_list(self):
+ def _run_get_msvc_sdk_version_list(self) -> None:
for vcver in Config.MSVC_VERSION_SUFFIX.keys():
for msvc_uwp_app in (True, False):
_ = WinSDK.get_msvc_sdk_version_list(vcver, msvc_uwp_app=msvc_uwp_app)
- def _run_version_list_sdk_map(self):
+ def _run_version_list_sdk_map(self) -> None:
for vcver in Config.MSVC_VERSION_SUFFIX.keys():
vs_def = Config.MSVC_VERSION_SUFFIX.get(vcver)
if not vs_def.vc_sdk_versions:
continue
_ = WinSDK._version_list_sdk_map(vs_def.vc_sdk_versions)
- def test_version_list_sdk_map(self):
+ def test_version_list_sdk_map(self) -> None:
self._run_version_list_sdk_map()
self._run_version_list_sdk_map()
self.assertTrue(WinSDK._sdk_map_cache, "WinSDK._sdk_map_cache is empty")
- def test_get_msvc_sdk_version_list(self):
+ def test_get_msvc_sdk_version_list(self) -> None:
self._run_get_msvc_sdk_version_list()
self._run_get_msvc_sdk_version_list()
self.assertTrue(WinSDK._sdk_cache, "WinSDK._sdk_cache is empty")
- def test_get_msvc_sdk_version_list_empty(self):
+ def test_get_msvc_sdk_version_list_empty(self) -> None:
func = WinSDK.get_msvc_sdk_version_list
for vcver in [None, '', '99', '99.9']:
sdk_versions = func(vcver)
@@ -124,7 +124,7 @@ class WinSDKTests(unittest.TestCase):
func.__name__, repr(vcver)
))
- def test_reset(self):
+ def test_reset(self) -> None:
self._run_reset()
if __name__ == "__main__":
diff --git a/SCons/Tool/MSCommon/MSVC/__init__.py b/SCons/Tool/MSCommon/MSVC/__init__.py
index 849c82d14..766894d9b 100644
--- a/SCons/Tool/MSCommon/MSVC/__init__.py
+++ b/SCons/Tool/MSCommon/MSVC/__init__.py
@@ -47,9 +47,9 @@ from . import ScriptArguments # noqa: F401
from . import Dispatcher as _Dispatcher
-def _reset():
+def _reset() -> None:
_Dispatcher.reset()
-def _verify():
+def _verify() -> None:
_Dispatcher.verify()
diff --git a/SCons/Tool/MSCommon/arch.py b/SCons/Tool/MSCommon/arch.py
index 6648bb6b6..e52687369 100644
--- a/SCons/Tool/MSCommon/arch.py
+++ b/SCons/Tool/MSCommon/arch.py
@@ -30,7 +30,7 @@ class ArchDefinition:
"""
A class for defining architecture-specific settings and logic.
"""
- def __init__(self, arch, synonyms=[]):
+ def __init__(self, arch, synonyms=[]) -> None:
self.arch = arch
self.synonyms = synonyms
diff --git a/SCons/Tool/MSCommon/common.py b/SCons/Tool/MSCommon/common.py
index ad4c827d3..185ccdf53 100644
--- a/SCons/Tool/MSCommon/common.py
+++ b/SCons/Tool/MSCommon/common.py
@@ -68,7 +68,7 @@ if LOGFILE:
class _Debug_Filter(logging.Filter):
# custom filter for module relative filename
- def filter(self, record):
+ def filter(self, record) -> bool:
relfilename = get_relative_filename(record.pathname, modulelist)
relfilename = relfilename.replace('\\', '/')
record.relfilename = relfilename
@@ -138,7 +138,7 @@ def read_script_env_cache():
return envcache
-def write_script_env_cache(cache):
+def write_script_env_cache(cache) -> None:
""" write out cache of msvc env vars if requested """
if CONFIG_CACHE:
try:
@@ -209,7 +209,7 @@ def has_reg(value):
# Functions for fetching environment variable settings from batch files.
-def normalize_env(env, keys, force=False):
+def normalize_env(env, keys, force: bool=False):
"""Given a dictionary representing a shell environment, add the variables
from os.environ needed for the processing of .bat files; the keys are
controlled by the keys argument.
@@ -369,7 +369,7 @@ def parse_output(output, keep=KEEPLIST):
for i in keep:
rdk[i] = re.compile('%s=(.*)' % i, re.I)
- def add_env(rmatch, key, dkeep=dkeep):
+ def add_env(rmatch, key, dkeep=dkeep) -> None:
path_list = rmatch.group(1).split(os.pathsep)
for path in path_list:
# Do not add empty paths (when a var ends with ;)
diff --git a/SCons/Tool/MSCommon/sdk.py b/SCons/Tool/MSCommon/sdk.py
index aa94f4d65..fd0892c8f 100644
--- a/SCons/Tool/MSCommon/sdk.py
+++ b/SCons/Tool/MSCommon/sdk.py
@@ -59,7 +59,7 @@ class SDKDefinition:
"""
An abstract base class for trying to find installed SDK directories.
"""
- def __init__(self, version, **kw):
+ def __init__(self, version, **kw) -> None:
self.version = version
self.__dict__.update(kw)
@@ -130,7 +130,7 @@ class WindowsSDK(SDKDefinition):
A subclass for trying to find installed Windows SDK directories.
"""
HKEY_FMT = r'Software\Microsoft\Microsoft SDKs\Windows\v%s\InstallationFolder'
- def __init__(self, *args, **kw):
+ def __init__(self, *args, **kw) -> None:
super().__init__(*args, **kw)
self.hkey_data = self.version
@@ -139,7 +139,7 @@ class PlatformSDK(SDKDefinition):
A subclass for trying to find installed Platform SDK directories.
"""
HKEY_FMT = r'Software\Microsoft\MicrosoftSDK\InstalledSDKS\%s\Install Dir'
- def __init__(self, *args, **kw):
+ def __init__(self, *args, **kw) -> None:
super().__init__(*args, **kw)
self.hkey_data = self.uuid
@@ -306,7 +306,7 @@ def get_installed_sdks():
SDKEnvironmentUpdates = {}
-def set_sdk_by_directory(env, sdk_dir):
+def set_sdk_by_directory(env, sdk_dir) -> None:
global SDKEnvironmentUpdates
debug('set_sdk_by_directory: Using dir:%s', sdk_dir)
try:
diff --git a/SCons/Tool/MSCommon/vc.py b/SCons/Tool/MSCommon/vc.py
index 787194062..1dc6b8d11 100644
--- a/SCons/Tool/MSCommon/vc.py
+++ b/SCons/Tool/MSCommon/vc.py
@@ -455,7 +455,7 @@ def get_native_host_platform():
return _native_host_platform
-def get_host_target(env, msvc_version, all_host_targets=False):
+def get_host_target(env, msvc_version, all_host_targets: bool=False):
vernum = float(get_msvc_version_numeric(msvc_version))
@@ -823,7 +823,7 @@ __INSTALLED_VCS_RUN = None
_VC_TOOLS_VERSION_FILE_PATH = ['Auxiliary', 'Build', 'Microsoft.VCToolsVersion.default.txt']
_VC_TOOLS_VERSION_FILE = os.sep.join(_VC_TOOLS_VERSION_FILE_PATH)
-def _check_cl_exists_in_vc_dir(env, vc_dir, msvc_version):
+def _check_cl_exists_in_vc_dir(env, vc_dir, msvc_version) -> bool:
"""Return status of finding a cl.exe to use.
Locates cl in the vc_dir depending on TARGET_ARCH, HOST_ARCH and the
@@ -963,7 +963,7 @@ def get_installed_vcs(env=None):
__INSTALLED_VCS_RUN = installed_versions
return __INSTALLED_VCS_RUN
-def reset_installed_vcs():
+def reset_installed_vcs() -> None:
"""Make it try again to find VC. This is just for the tests."""
global __INSTALLED_VCS_RUN
__INSTALLED_VCS_RUN = None
@@ -1099,7 +1099,7 @@ def get_default_version(env):
return msvc_version
-def msvc_setup_env_once(env, tool=None):
+def msvc_setup_env_once(env, tool=None) -> None:
try:
has_run = env["MSVC_SETUP_RUN"]
except KeyError:
@@ -1340,7 +1340,7 @@ def msvc_setup_env_tool(env=None, version=None, tool=None):
rval = True
return rval
-def msvc_sdk_versions(version=None, msvc_uwp_app=False):
+def msvc_sdk_versions(version=None, msvc_uwp_app: bool=False):
debug('version=%s, msvc_uwp_app=%s', repr(version), repr(msvc_uwp_app))
rval = []
@@ -1360,7 +1360,7 @@ def msvc_sdk_versions(version=None, msvc_uwp_app=False):
rval = MSVC.WinSDK.get_msvc_sdk_version_list(version, msvc_uwp_app)
return rval
-def msvc_toolset_versions(msvc_version=None, full=True, sxs=False):
+def msvc_toolset_versions(msvc_version=None, full: bool=True, sxs: bool=False):
debug('msvc_version=%s, full=%s, sxs=%s', repr(msvc_version), repr(full), repr(sxs))
env = None
@@ -1410,7 +1410,7 @@ def msvc_toolset_versions_spectre(msvc_version=None):
rval = MSVC.ScriptArguments._msvc_toolset_versions_spectre_internal(msvc_version, vc_dir)
return rval
-def msvc_query_version_toolset(version=None, prefer_newest=True):
+def msvc_query_version_toolset(version=None, prefer_newest: bool=True):
"""
Returns an msvc version and a toolset version given a version
specification.
diff --git a/SCons/Tool/MSCommon/vcTests.py b/SCons/Tool/MSCommon/vcTests.py
index 3e37def2e..c4cf2af69 100644
--- a/SCons/Tool/MSCommon/vcTests.py
+++ b/SCons/Tool/MSCommon/vcTests.py
@@ -47,12 +47,12 @@ MS_TOOLS_VERSION = '1.1.1'
class VswhereTestCase(unittest.TestCase):
@staticmethod
- def _createVSWhere(path):
+ def _createVSWhere(path) -> None:
os.makedirs(os.path.dirname(path), exist_ok=True)
with open(path, 'w') as f:
f.write("Created:%s" % f)
- def testDefaults(self):
+ def testDefaults(self) -> None:
"""
Verify that msvc_find_vswhere() find's files in the specified paths
"""
@@ -75,7 +75,7 @@ class VswhereTestCase(unittest.TestCase):
class MSVcTestCase(unittest.TestCase):
@staticmethod
- def _createDummyCl(path, add_bin=True):
+ def _createDummyCl(path, add_bin: bool=True) -> None:
"""
Creates a dummy cl.exe in the correct directory.
It will create all missing parent directories as well
@@ -101,7 +101,7 @@ class MSVcTestCase(unittest.TestCase):
ct.write('created')
- def runTest(self):
+ def runTest(self) -> None:
"""
Check that all proper HOST_PLATFORM and TARGET_PLATFORM are handled.
Verify that improper HOST_PLATFORM and/or TARGET_PLATFORM are properly handled.
@@ -307,13 +307,13 @@ class Patch:
return hook
@classmethod
- def restore(cls):
+ def restore(cls) -> None:
MSCommon.vc.msvc_default_version = cls.msvc_default_version
class MsvcSdkVersionsTests(unittest.TestCase):
"""Test msvc_sdk_versions"""
- def run_valid_default_msvc(self):
+ def run_valid_default_msvc(self) -> None:
symbol = MSCommon.vc.msvc_default_version()
version_def = MSCommon.msvc_version_components(symbol)
for msvc_uwp_app in (True, False):
@@ -323,14 +323,14 @@ class MsvcSdkVersionsTests(unittest.TestCase):
else:
self.assertFalse(sdk_list, "SDK list is not empty for msvc version {}".format(repr(None)))
- def test_valid_default_msvc(self):
+ def test_valid_default_msvc(self) -> None:
if Data.HAVE_MSVC:
Patch.MSCommon.vc.msvc_default_version.enable_none()
self.run_valid_default_msvc()
Patch.MSCommon.vc.msvc_default_version.restore()
self.run_valid_default_msvc()
- def test_valid_vcver(self):
+ def test_valid_vcver(self) -> None:
for symbol in MSCommon.vc._VCVER:
version_def = MSCommon.msvc_version_components(symbol)
for msvc_uwp_app in (True, False):
@@ -340,7 +340,7 @@ class MsvcSdkVersionsTests(unittest.TestCase):
else:
self.assertFalse(sdk_list, "SDK list is not empty for msvc version {}".format(repr(symbol)))
- def test_valid_vcver_toolsets(self):
+ def test_valid_vcver_toolsets(self) -> None:
for symbol in MSCommon.vc._VCVER:
toolset_list = MSCommon.vc.msvc_toolset_versions(msvc_version=symbol, full=True, sxs=True)
if toolset_list is None:
@@ -354,13 +354,13 @@ class MsvcSdkVersionsTests(unittest.TestCase):
)
self.assertTrue(sdk_list, "SDK list is empty for msvc toolset version {}".format(repr(toolset)))
- def test_invalid_vcver(self):
+ def test_invalid_vcver(self) -> None:
for symbol in ['6.0Exp', '14.3Exp', '99', '14.1Bug']:
for msvc_uwp_app in (True, False):
with self.assertRaises(MSCommon.vc.MSVCArgumentError):
_ = MSCommon.vc.msvc_sdk_versions(version=symbol, msvc_uwp_app=msvc_uwp_app)
- def test_invalid_vcver_toolsets(self):
+ def test_invalid_vcver_toolsets(self) -> None:
for symbol in ['14.31.123456', '14.31.1.1']:
for msvc_uwp_app in (True, False):
with self.assertRaises(MSCommon.vc.MSVCArgumentError):
@@ -369,7 +369,7 @@ class MsvcSdkVersionsTests(unittest.TestCase):
class MsvcToolsetVersionsTests(unittest.TestCase):
"""Test msvc_toolset_versions"""
- def run_valid_default_msvc(self):
+ def run_valid_default_msvc(self) -> None:
symbol = MSCommon.vc.msvc_default_version()
version_def = MSCommon.msvc_version_components(symbol)
toolset_none_list = MSCommon.vc.msvc_toolset_versions(msvc_version=None, full=False, sxs=False)
@@ -386,14 +386,14 @@ class MsvcToolsetVersionsTests(unittest.TestCase):
self.assertFalse(toolset_all_list, "Toolset all list is not empty for msvc version {}".format(repr(None)))
self.assertFalse(toolset_none_list, "Toolset none list is not empty for msvc version {}".format(repr(None)))
- def test_valid_default_msvc(self):
+ def test_valid_default_msvc(self) -> None:
if Data.HAVE_MSVC:
Patch.MSCommon.vc.msvc_default_version.enable_none()
self.run_valid_default_msvc()
Patch.MSCommon.vc.msvc_default_version.restore()
self.run_valid_default_msvc()
- def test_valid_vcver(self):
+ def test_valid_vcver(self) -> None:
for symbol in MSCommon.vc._VCVER:
version_def = MSCommon.msvc_version_components(symbol)
toolset_none_list = MSCommon.vc.msvc_toolset_versions(msvc_version=symbol, full=False, sxs=False)
@@ -410,14 +410,14 @@ class MsvcToolsetVersionsTests(unittest.TestCase):
self.assertFalse(toolset_all_list, "Toolset all list is not empty for msvc version {}".format(repr(symbol)))
self.assertFalse(toolset_none_list, "Toolset none list is not empty for msvc version {}".format(repr(symbol)))
- def test_invalid_vcver(self):
+ def test_invalid_vcver(self) -> None:
for symbol in ['12.9', '6.0Exp', '14.3Exp', '99', '14.1Bug']:
with self.assertRaises(MSCommon.vc.MSVCArgumentError):
_ = MSCommon.vc.msvc_toolset_versions(msvc_version=symbol)
class MsvcToolsetVersionsSpectreTests(unittest.TestCase):
- def run_valid_default_msvc(self):
+ def run_valid_default_msvc(self) -> None:
symbol = MSCommon.vc.msvc_default_version()
version_def = MSCommon.msvc_version_components(symbol)
spectre_toolset_list = MSCommon.vc.msvc_toolset_versions_spectre(msvc_version=None)
@@ -427,14 +427,14 @@ class MsvcToolsetVersionsSpectreTests(unittest.TestCase):
else:
self.assertFalse(spectre_toolset_list, "Toolset spectre list is not empty for msvc version {}".format(repr(None)))
- def test_valid_default_msvc(self):
+ def test_valid_default_msvc(self) -> None:
if Data.HAVE_MSVC:
Patch.MSCommon.vc.msvc_default_version.enable_none()
self.run_valid_default_msvc()
Patch.MSCommon.vc.msvc_default_version.restore()
self.run_valid_default_msvc()
- def test_valid_vcver(self):
+ def test_valid_vcver(self) -> None:
for symbol in MSCommon.vc._VCVER:
version_def = MSCommon.msvc_version_components(symbol)
spectre_toolset_list = MSCommon.vc.msvc_toolset_versions_spectre(msvc_version=symbol)
@@ -444,7 +444,7 @@ class MsvcToolsetVersionsSpectreTests(unittest.TestCase):
else:
self.assertFalse(spectre_toolset_list, "Toolset spectre list is not empty for msvc version {}".format(repr(symbol)))
- def test_invalid_vcver(self):
+ def test_invalid_vcver(self) -> None:
for symbol in ['12.9', '6.0Exp', '14.3Exp', '99', '14.1Bug']:
with self.assertRaises(MSCommon.vc.MSVCArgumentError):
_ = MSCommon.vc.msvc_toolset_versions_spectre(msvc_version=symbol)
@@ -452,7 +452,7 @@ class MsvcToolsetVersionsSpectreTests(unittest.TestCase):
class MsvcQueryVersionToolsetTests(unittest.TestCase):
"""Test msvc_query_toolset_version"""
- def run_valid_default_msvc(self, have_msvc):
+ def run_valid_default_msvc(self, have_msvc) -> None:
for prefer_newest in (True, False):
msvc_version, msvc_toolset_version = MSCommon.vc.msvc_query_version_toolset(
version=None, prefer_newest=prefer_newest
@@ -468,14 +468,14 @@ class MsvcQueryVersionToolsetTests(unittest.TestCase):
repr(None)
))
- def test_valid_default_msvc(self):
+ def test_valid_default_msvc(self) -> None:
if Data.HAVE_MSVC:
Patch.MSCommon.vc.msvc_default_version.enable_none()
self.run_valid_default_msvc(have_msvc=False)
Patch.MSCommon.vc.msvc_default_version.restore()
self.run_valid_default_msvc(have_msvc=Data.HAVE_MSVC)
- def test_valid_vcver(self):
+ def test_valid_vcver(self) -> None:
for symbol in MSCommon.vc._VCVER:
version_def = MSCommon.msvc_version_components(symbol)
for prefer_newest in (True, False):
@@ -489,7 +489,7 @@ class MsvcQueryVersionToolsetTests(unittest.TestCase):
repr(symbol)
))
- def test_valid_vcver_toolsets(self):
+ def test_valid_vcver_toolsets(self) -> None:
for symbol in MSCommon.vc._VCVER:
toolset_list = MSCommon.vc.msvc_toolset_versions(msvc_version=symbol, full=True, sxs=True)
if toolset_list is None:
@@ -508,7 +508,7 @@ class MsvcQueryVersionToolsetTests(unittest.TestCase):
repr(toolset)
))
- def test_msvc_query_version_toolset_notfound(self):
+ def test_msvc_query_version_toolset_notfound(self) -> None:
toolset_notfound_dict = Data.msvc_toolset_notfound_dict()
for toolset_notfound_list in toolset_notfound_dict.values():
for toolset in toolset_notfound_list[:1]:
@@ -516,13 +516,13 @@ class MsvcQueryVersionToolsetTests(unittest.TestCase):
with self.assertRaises(MSCommon.vc.MSVCToolsetVersionNotFound):
_ = MSCommon.vc.msvc_query_version_toolset(version=toolset, prefer_newest=prefer_newest)
- def test_invalid_vcver(self):
+ def test_invalid_vcver(self) -> None:
for symbol in ['12.9', '6.0Exp', '14.3Exp', '99', '14.1Bug']:
for prefer_newest in (True, False):
with self.assertRaises(MSCommon.vc.MSVCArgumentError):
_ = MSCommon.vc.msvc_query_version_toolset(version=symbol, prefer_newest=prefer_newest)
- def test_invalid_vcver_toolsets(self):
+ def test_invalid_vcver_toolsets(self) -> None:
for symbol in ['14.16.00000Exp', '14.00.00001', '14.31.123456', '14.31.1.1']:
for prefer_newest in (True, False):
with self.assertRaises(MSCommon.vc.MSVCArgumentError):
diff --git a/SCons/Tool/MSCommon/vs.py b/SCons/Tool/MSCommon/vs.py
index 08c3cf5af..00ccaef94 100644
--- a/SCons/Tool/MSCommon/vs.py
+++ b/SCons/Tool/MSCommon/vs.py
@@ -46,7 +46,7 @@ class VisualStudio:
An abstract base class for trying to find installed versions of
Visual Studio.
"""
- def __init__(self, version, **kw):
+ def __init__(self, version, **kw) -> None:
self.version = version
kw['vc_version'] = kw.get('vc_version', version)
kw['sdk_version'] = kw.get('sdk_version', version)
@@ -148,7 +148,7 @@ class VisualStudio:
self._cache['supported_arch'] = self.supported_arch
return self.supported_arch
- def reset(self):
+ def reset(self) -> None:
self._cache = {}
# The list of supported Visual Studio versions we know how to detect.
@@ -439,7 +439,7 @@ def get_installed_visual_studios(env=None):
InstalledVSMap[vs.version] = vs
return InstalledVSList
-def reset_installed_visual_studios():
+def reset_installed_visual_studios() -> None:
global InstalledVSList
global InstalledVSMap
InstalledVSList = None
@@ -564,12 +564,12 @@ def get_default_arch(env):
return arch
-def merge_default_version(env):
+def merge_default_version(env) -> None:
version = get_default_version(env)
arch = get_default_arch(env)
# TODO: refers to versions and arch which aren't defined; called nowhere. Drop?
-def msvs_setup_env(env):
+def msvs_setup_env(env) -> None:
msvs = get_vs_by_version(version)
if msvs is None:
return
View Lorry Controller Status