Skip to content

gyp: cherrypick more Python3 changes from node-gyp #28563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cclauss wants to merge 2 commits into from
Closed

gyp: cherrypick more Python3 changes from node-gyp #28563

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1019de
gyp: cherrypick more Python3 changes from node-gyp
cclauss Jul 5, 2019
a781792
Fix indentation
cclauss Jul 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix indentation
  • Loading branch information
@cclauss
cclauss committed Jul 15, 2019
commit a7817928e3e5cd962528bbb28d3be8b0382ed4a2
8 changes: 4 additions & 4 deletions tools/gyp/pylib/gyp/MSVSSettings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
msvs_tool[msvs_setting](msvs_value, msbuild_settings)
except ValueError as e:
print('Warning: while converting %s/%s to MSBuild, '
'%s' % (msvs_tool_name, msvs_setting, e), file=stderr)
'%s' % (msvs_tool_name, msvs_setting, e), file=stderr)
else:
_ValidateExclusionSetting(msvs_setting,
msvs_tool,
Expand All @@ -477,7 +477,7 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
stderr)
else:
print('Warning: unrecognized tool %s while converting to '
'MSBuild.' % msvs_tool_name, file=stderr)
'MSBuild.' % msvs_tool_name, file=stderr)
return msbuild_settings


Expand Down Expand Up @@ -522,8 +522,8 @@ def _ValidateSettings(validators, settings, stderr):
try:
tool_validators[setting](value)
except ValueError as e:
print('Warning: for %s/%s, %s' %
(tool_name, setting, e), file=stderr)
print('Warning: for %s/%s, %s' % (tool_name, setting, e),
file=stderr)
else:
_ValidateExclusionSetting(setting,
tool_validators,
Expand Down