fix --try-software-version using non-greedy matching + lookahead assertion, add test for tweak_one #2166
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
…rtion, add test for tweak_one
wpoely86
reviewed
Mar 14, 2017
| regexp = re.compile(r"^(?P<key>\s*%s)\s*=\s*(?P<val>\[(.|\n)*\])\s*$" % key, re.M) | ||
| # use non-greedy matching for list value using '*?' to avoid including other parameters in match, | ||
| # and a lookahead assertion (?=...) so next line is either another parameter definition or a blank line | ||
| regexp = re.compile(r"^(?P<key>\s*%s)\s*=\s*(?P<val>\[(.|\n)*?\])\s*$(?=\n^(\w+\s*=.*|\s*)$)" % key, re.M) |
There was a problem hiding this comment.
Doesn't \s also match \n in multiline mode?
There was a problem hiding this comment.
The last | in the lookahead assertion is there to check that the next line is either a parameter definition or a blank line (or the end of the file, see last commit).
Where is it relevant that \s also matches \n?
wpoely86
approved these changes
Mar 14, 2017
|
Thanks for the review @wpoely86! |
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.
fix for #2163; #2163 (comment) is probably useful to get a good idea of why this fix is needed