skip ValueError for long, list and dict type; #1085
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jan 7, 2017
bnoordhuis
reviewed
Jan 9, 2017
| @@ -1222,6 +1222,8 @@ def ProcessVariablesAndConditionsInDict(the_dict, phase, variables_in, | |||
| # Skip "variables", which was already processed if present. | |||
| if key != 'variables' and type(value) is str: | |||
| expanded = ExpandVariables(value, phase, variables, build_file) | |||
| if type(expanded) in (long, list, dict): | |||
| continue | |||
There was a problem hiding this comment.
This doesn't look self-evidently correct to me. What is yarn doing that npm doesn't that causes ExpandVariables to return unexpected types? long is acceptable because int is accepted but why list and dict? With what keys do you get those?
There was a problem hiding this comment.
Seems I answered that question 8 months ago in #903 (comment)... I suppose the question then becomes whether this is the only ExpandVariables call site that needs updating.
There was a problem hiding this comment.
I added extra debug lines.
I got only long. No list or dict.
[
{"type(expanded)": "<type 'long'>", "expanded": "1483986851164", "value": "1483986851164", "phase": "0", "build_file": "binding.gyp"}
{"type(expanded)": "<type 'long'>", "expanded": "1483986851164", "value": "1483986851164", "phase": "0", "build_file": "deps\\libexpat\\libexpat.gyp"}
]allow long as result of ExpandVariables call. along with str and int. skip long type(value) along with str
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
skip ValueError for long, list and dict type;
refs yarnpkg/yarn#2286
refs yarnpkg/yarn#2376