Reduce scope of try except StopIteration wrapping #39596
Merged
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
Aimed to reduce amount of code where in one hand a 3 tuple were returned and in the other hand a 2 tuple value.
ticosax
commented
Feb 23, 2017
| nret.add(minion) | ||
| continue | ||
| else: | ||
| try: | ||
| m = next(six.iterkeys(ret)) |
There was a problem hiding this comment.
I think the try except StopIteration was only intended for this line.
@cachedout better if you confirm yourself, since you added it in 1600f3e
There was a problem hiding this comment.
I think you are correct here. I was being overly broad. This is better.
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.
Aimed to reduce
amount of codescope of try except where in one hand a 3 tuple werereturned and in the other hand a 2 tuple value.
@cachedout
There was 2 contradictory refactoring happening at different period.
74e1803
and
fe338ff
There were both correct taken separately but ended up being wrong when used together.
Something probably get lost during backporting. I didn't investigating further.
What does this PR do?
refactoring some code to simplify it.
Previous Behavior
sometimes a tuple of 2 items were returned while we expect 3 items.
Tests written?
No
Please review Salt's Contributing Guide for best practices.