summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Brill <48932340+jcbrill@users.noreply.github.com>2022-06-12 18:26:55 (GMT)
committerJoseph Brill <48932340+jcbrill@users.noreply.github.com>2022-06-12 18:26:55 (GMT)
commit49d6e9acd28bf0301efe4ae757615b6042abbcef (patch)
tree9986ba42d18b9c3d0fe525863c0de4c2087d3659
parent3a760ae7934f840a6c029cbac95bdbb74cf11a3e (diff)
downloadSCons-49d6e9acd28bf0301efe4ae757615b6042abbcef.zip
SCons-49d6e9acd28bf0301efe4ae757615b6042abbcef.tar.gz
SCons-49d6e9acd28bf0301efe4ae757615b6042abbcef.tar.bz2
Fix sider complaints
-rw-r--r--SCons/Tool/MSCommon/vc.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/SCons/Tool/MSCommon/vc.py b/SCons/Tool/MSCommon/vc.py
index ac247d1..cfba816 100644
--- a/SCons/Tool/MSCommon/vc.py
+++ b/SCons/Tool/MSCommon/vc.py
@@ -109,7 +109,7 @@ VS2008 = 9.0
VS2005 = 8.0
VS2003 = 7.1
VS2002 = 7.0
-VS6 = 6.0
+VS6 = 6.0
# Force -vcvars_ver argument for default toolset
_MSVC_TOOLSET_DEFAULT_VCVARSVER = False
@@ -1548,7 +1548,7 @@ class _MSVCScriptArguments:
toolsets_full = []
build_dir = os.path.join(vc_dir, "Auxiliary", "Build")
- sxs_toolsets = [ f.name for f in os.scandir(build_dir) if f.is_dir() ]
+ sxs_toolsets = [f.name for f in os.scandir(build_dir) if f.is_dir()]
for sxs_toolset in sxs_toolsets:
filename = 'Microsoft.VCToolsVersion.{}.txt'.format(sxs_toolset)
filepath = os.path.join(build_dir, sxs_toolset, filename)
@@ -1560,7 +1560,7 @@ class _MSVCScriptArguments:
debug('sxs toolset: msvc_version=%s, sxs_version=%s, toolset_version=%s', repr(version), repr(sxs_toolset), toolset_version)
toolset_dir = os.path.join(vc_dir, "Tools", "MSVC")
- toolsets = [ f.name for f in os.scandir(toolset_dir) if f.is_dir() ]
+ toolsets = [f.name for f in os.scandir(toolset_dir) if f.is_dir()]
for toolset_version in toolsets:
binpath = os.path.join(toolset_dir, toolset_version, "bin")
if os.path.exists(binpath):
@@ -1856,7 +1856,7 @@ class _MSVCScriptArguments:
def reset(cls):
debug('reset')
- cl._reset_toolset()
+ cls._reset_toolset()
def msvc_find_valid_batch_script(env, version):
"""Find and execute appropriate batch script to set up build env.