Add Capturable* argparse structures to mypy.main #7804
Merged
Conversation
This file contains hidden or 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
JukkaL
reviewed
Oct 28, 2019
| def test_capture_bad_opt(self) -> None: | ||
| """stderr should be captured when a bad option is passed.""" | ||
| _, stderr, _ = mypy.api.run(['--some-bad-option']) | ||
| assert stderr != '' |
There was a problem hiding this comment.
Also test that the return value is a string, as otherwise the inequality will be trivially true. This might happen if it's None, at least. Maybe like this: assert isinstance(stderr, str) and stderr != ''
| def test_capture_empty(self) -> None: | ||
| """stderr should be captured when a bad option is passed.""" | ||
| _, stderr, _ = mypy.api.run([]) | ||
| assert stderr != '' |
| def test_capture_help(self) -> None: | ||
| """stdout should be captured when --help is passed.""" | ||
| stdout, _, _ = mypy.api.run(['--help']) | ||
| assert stdout != '' |
| def test_capture_version(self) -> None: | ||
| """stdout should be captured when --version is passed.""" | ||
| stdout, _, _ = mypy.api.run(['--version']) | ||
| assert stdout != '' |
| self.exit(2, gettext('%(prog)s: error: %(message)s\n') % args) | ||
|
|
||
|
|
||
| class CapturableVersionAction(argparse.Action): |
There was a problem hiding this comment.
Add docstring (maybe refer to the docstring that I requested for CapturableArgumentParser).
| @@ -252,6 +257,89 @@ def infer_python_executable(options: Options, | |||
| Define MYPY_CACHE_DIR to override configuration cache_dir path.""" # type: Final | |||
|
|
|||
|
|
|||
| class CapturableArgumentParser(argparse.ArgumentParser): | |||
There was a problem hiding this comment.
Add docstring that explains what this does and why we need to do this.
mypy/main.py
Outdated
|
|
||
| def __init__(self, *args: Any, **kwargs: Any): | ||
| try: | ||
| self.stdout = kwargs.pop('stdout') |
There was a problem hiding this comment.
Maybe you can avoid the try statements by using kwargs.pop('stdout', sys.stdout) (and similarly for stderr).
JukkaL
approved these changes
Oct 29, 2019
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 #7800
Most of this code is yanked from the standard library since the same behaviors are desired, just with plumbing for
stdout/stderr. One difference of note is thatversionis mandatory inCapturableVersionAction.__init__to get around this error:I'm unaware of a situation where that line wouldn't raise an
AttributeError🤔Anyways, I didn't want to patch
sys.stdout/sys.stderrin order to avoid reintroducing #6125.