minor formatting updates

9 files changed, 30 insertions, 32 deletions

diff --git a/test/MSVC/MSVC_SCRIPTERROR_POLICY.py b/test/MSVC/MSVC_SCRIPTERROR_POLICY.py
index 9dcfb53e5..5aa1682ed 100644
--- a/test/MSVC/MSVC_SCRIPTERROR_POLICY.py
+++ b/test/MSVC/MSVC_SCRIPTERROR_POLICY.py
@@ -26,15 +26,14 @@ Test the MSVC_SCRIPTERROR_POLICY construction variable and functions.
 """
 
 import TestSCons
+import textwrap
+
+from SCons.Tool.MSCommon.vc import get_installed_vcs_components
 
 test = TestSCons.TestSCons()
 
 test.skip_if_not_msvc()
 
-import textwrap
-
-from SCons.Tool.MSCommon.vc import get_installed_vcs_components
-
 installed_versions = get_installed_vcs_components()
 
 default_version = installed_versions[0]
diff --git a/test/MSVC/MSVC_SDK_VERSION.py b/test/MSVC/MSVC_SDK_VERSION.py
index 62eaf6e0b..e2f78be9e 100644
--- a/test/MSVC/MSVC_SDK_VERSION.py
+++ b/test/MSVC/MSVC_SDK_VERSION.py
@@ -24,18 +24,17 @@
 """
 Test the MSVC_SDK_VERSION construction variable.
 """
+import textwrap
 
+from SCons.Tool.MSCommon.vc import get_installed_vcs_components
+from SCons.Tool.MSCommon import msvc_sdk_versions
+from SCons.Tool.MSCommon import msvc_toolset_versions
 import TestSCons
 
 test = TestSCons.TestSCons()
 
 test.skip_if_not_msvc()
 
-import textwrap
-
-from SCons.Tool.MSCommon.vc import get_installed_vcs_components
-from SCons.Tool.MSCommon import msvc_sdk_versions
-from SCons.Tool.MSCommon import msvc_toolset_versions
 
 installed_versions = get_installed_vcs_components()
 
diff --git a/test/MSVC/MSVC_SPECTRE_LIBS.py b/test/MSVC/MSVC_SPECTRE_LIBS.py
index d5b0c4de2..ea98fd5c6 100644
--- a/test/MSVC/MSVC_SPECTRE_LIBS.py
+++ b/test/MSVC/MSVC_SPECTRE_LIBS.py
@@ -26,16 +26,15 @@ Test the MSVC_SPECTRE_LIBS construction variable.
 """
 
 import TestSCons
-
-test = TestSCons.TestSCons()
-
-test.skip_if_not_msvc()
-
 import textwrap
 
 from SCons.Tool.MSCommon.vc import get_installed_vcs_components
 from SCons.Tool.MSCommon import msvc_toolset_versions_spectre
 
+test = TestSCons.TestSCons()
+
+test.skip_if_not_msvc()
+
 installed_versions = get_installed_vcs_components()
 
 GE_VS2017_versions = [v for v in installed_versions if v.msvc_vernum >= 14.1]
diff --git a/test/MSVC/MSVC_TOOLSET_VERSION.py b/test/MSVC/MSVC_TOOLSET_VERSION.py
index 01d43b1f1..db40c95fd 100644
--- a/test/MSVC/MSVC_TOOLSET_VERSION.py
+++ b/test/MSVC/MSVC_TOOLSET_VERSION.py
@@ -24,6 +24,10 @@
 """
 Test the MSVC_TOOLSET_VERSION construction variable.
 """
+import textwrap
+
+from SCons.Tool.MSCommon.vc import get_installed_vcs_components
+from SCons.Tool.MSCommon import msvc_toolset_versions
 
 import TestSCons
 
@@ -31,11 +35,6 @@ test = TestSCons.TestSCons()
 
 test.skip_if_not_msvc()
 
-import textwrap
-
-from SCons.Tool.MSCommon.vc import get_installed_vcs_components
-from SCons.Tool.MSCommon import msvc_toolset_versions
-
 installed_versions = get_installed_vcs_components()
 
 default_version = installed_versions[0]
diff --git a/test/MSVC/MSVC_UWP_APP.py b/test/MSVC/MSVC_UWP_APP.py
index 1f1c230a0..645fc0ed1 100644
--- a/test/MSVC/MSVC_UWP_APP.py
+++ b/test/MSVC/MSVC_UWP_APP.py
@@ -24,17 +24,16 @@
 """
 Test the MSVC_UWP_APP construction variable.
 """
+import textwrap
+import re
 
+from SCons.Tool.MSCommon.vc import get_installed_vcs_components
 import TestSCons
 
 test = TestSCons.TestSCons()
 
 test.skip_if_not_msvc()
 
-import textwrap
-import re
-
-from SCons.Tool.MSCommon.vc import get_installed_vcs_components
 
 installed_versions = get_installed_vcs_components()
 
@@ -54,6 +53,7 @@ re_lib_eq2015_2 = re.compile(r'\\vc\\lib\\store', re.IGNORECASE)
 re_lib_ge2017_1 = re.compile(r'\\lib\\x86\\store\\references', re.IGNORECASE)
 re_lib_ge2017_2 = re.compile(r'\\lib\\x64\\store', re.IGNORECASE)
 
+
 def check_libpath(msvc, active, output):
 
     def _check_libpath(msvc, output):
@@ -65,13 +65,13 @@ def check_libpath(msvc, active, output):
             for regex in (re_lib_eq2015_1, re_lib_eq2015_2):
                 if regex.search(libpath):
                     n_matches += 1
-            return (n_matches >= 2, 'store', libpath)
+            return n_matches >= 2, 'store', libpath
         elif platform == 'UWP':
             for regex in (re_lib_ge2017_1, re_lib_ge2017_2):
                 if regex.search(libpath):
                     n_matches += 1
-            return (n_matches > 0, 'uwp', libpath)
-        return (False, 'uwp', libpath)
+            return n_matches > 0, 'uwp', libpath
+        return False, 'uwp', libpath
 
     found, kind, libpath = _check_libpath(msvc, output)
 
diff --git a/test/MSVC/msvc_cache_force_defaults.py b/test/MSVC/msvc_cache_force_defaults.py
index 7aee8503b..a8396d959 100644
--- a/test/MSVC/msvc_cache_force_defaults.py
+++ b/test/MSVC/msvc_cache_force_defaults.py
@@ -25,16 +25,15 @@
 Test SCONS_CACHE_MSVC_FORCE_DEFAULTS system environment variable.
 """
 
+import textwrap
+
+from SCons.Tool.MSCommon.vc import get_installed_vcs_components
 import TestSCons
 
 test = TestSCons.TestSCons()
 
 test.skip_if_not_msvc()
 
-import textwrap
-
-from SCons.Tool.MSCommon.vc import get_installed_vcs_components
-
 installed_versions = get_installed_vcs_components()
 
 default_version = installed_versions[0]
diff --git a/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_sdk_versions.py b/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_sdk_versions.py
index 62e77ab19..7953ce62a 100644
--- a/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_sdk_versions.py
+++ b/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_sdk_versions.py
@@ -12,4 +12,4 @@ SCons.Tool.MSCommon.vc.find_vc_pdir_vswhere = DummyVsWhere
 
 sdk_version_list = SCons.Tool.MSCommon.msvc_sdk_versions()
 
-print('sdk_version_list='+repr(sdk_version_list))
\ No newline at end of file
+print('sdk_version_list='+repr(sdk_version_list))
diff --git a/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_toolset_versions.py b/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_toolset_versions.py
index 3aec559b4..fd209fd19 100644
--- a/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_toolset_versions.py
+++ b/test/fixture/no_msvc/no_msvcs_sconstruct_msvc_toolset_versions.py
@@ -12,4 +12,4 @@ SCons.Tool.MSCommon.vc.find_vc_pdir_vswhere = DummyVsWhere
 
 toolset_version_list = SCons.Tool.MSCommon.msvc_toolset_versions()
 
-print('toolset_version_list='+repr(toolset_version_list))
\ No newline at end of file
+print('toolset_version_list='+repr(toolset_version_list))
diff --git a/test/fixture/no_msvc/no_msvcs_sconstruct_version.py b/test/fixture/no_msvc/no_msvcs_sconstruct_version.py
index 1e7c55f8f..b586d6c76 100644
--- a/test/fixture/no_msvc/no_msvcs_sconstruct_version.py
+++ b/test/fixture/no_msvc/no_msvcs_sconstruct_version.py
@@ -1,10 +1,12 @@
 import SCons
 import SCons.Tool.MSCommon
 
+
 def DummyVsWhere(msvc_version, env):
     # not testing versions with vswhere, so return none
     return None
 
+
 for key in SCons.Tool.MSCommon.vc._VCVER_TO_PRODUCT_DIR:
     SCons.Tool.MSCommon.vc._VCVER_TO_PRODUCT_DIR[key]=[(SCons.Util.HKEY_LOCAL_MACHINE, r'')]
 
@@ -14,3 +16,4 @@ SCons.Tool.MSCommon.msvc_set_notfound_policy('error')
 
 env = SCons.Environment.Environment(MSVC_VERSION='14.3')
 
+