fix @boegel's remarks ;-) #10
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
| @@ -855,11 +869,15 @@ def test_option_as_value(self): | |||
| self._match_testoption1_sysexit(['--store', '-b'], | |||
| "Value '-b' is also a valid option") | |||
|
|
|||
| # same for --store=-b | |||
| self._match_testoption1_sysexit(['--store=-b'], | |||
There was a problem hiding this comment.
why would this fail? this has to work since it's unambigous
There was a problem hiding this comment.
yes, indeed, that's also why my modified stuff doesn't pass the tests, will push another commit to fix this
|
@stdweird: updated, please check again, I removed the bogus test and implement support to recognise |
| @@ -488,7 +489,7 @@ def __init__(self, *args, **kwargs): | |||
| self.environment_arguments = None | |||
| self.commandline_arguments = None | |||
|
|
|||
| def is_value_a_commandline_option(self, value, index=None): | |||
| def is_value_a_commandline_option(self, opt, value, index=None): | |||
| """ | |||
| Determine if value is/could be an option passed via the commandline. | |||
| # This is not the value you are looking for | ||
| return None | ||
|
|
||
| if not self.ALLOW_OPTION_NAME_AS_VALUE: | ||
| if '-%s' % value in self._short_opt or '-%s' % value in self._long_opt: | ||
| return "'-%(val)s' is a valid option, so using '%(val)s' as value is likely a typo" % {'val': value} |
There was a problem hiding this comment.
remove the so using '%(val)s' as value is likely a typo it's not required (and none of the other error messages have it)
| if not self.ALLOW_OPTION_NAME_AS_VALUE: | ||
| if '-%s' % value in self._short_opt or '-%s' % value in self._long_opt: | ||
| return "'-%(val)s' is a valid option, so using '%(val)s' as value is likely a typo" % {'val': value} | ||
|
|
||
| # First test the exact problem where the value is an option | ||
| if (not self.ALLOW_OPTION_AS_VALUE) and (value in self._long_opt or value in self._short_opt): |
There was a problem hiding this comment.
also here value in self._long_opt + self._short_opt
|
@boegel thx a lot |
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.
for hpcugent#185