| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
Delays the closing for `SubprocessStreamProtocol._transport` until all pipes have been closed and the process has exited rather than just the process exiting. This allows for reading data from the subprocess that is still pending in the pipe after the process has exited.
|
As pretty much the sole author of SubprocessStreamProtocol I think you're the best to review this @Haypo. (If you don't want to be pinged in the future let me know! :) ) |
Sorry, something went wrong.
|
cc @asvetlov. Although without a test there's nothing to review :) |
Sorry, something went wrong.
|
@1st1 Yes that's true, it'd be nice to get a nod to say this is actually a sane thing to do though. Doesn't break any other tests but I don't know what other untested assumptions I might be breaking! :P |
Sorry, something went wrong.
It looks sane. Asking for a review without tests isn't productive though, because you're essentially asking someone to stop doing what they are doing, understand (or remember, doesn't matter) your patch and all code that it touches, and make an opinion if your patch works. PRs without tests are usually reviewed the last if at all. |
Sorry, something went wrong.
|
Sorry, won't do it again. I added a simple test that fails on old build and passes with the proposed change. I presume it's okay to have a test that doesn't assert anything, just to make sure that no errors are thrown? The test is taken pretty much 1-to-1 with the attached issue. I'm sure I can come up with a few more tests if more tests are required. :) |
Sorry, something went wrong.
|
I can confirm that this pull request fixes my issue #484 |
Sorry, something went wrong.
| def _maybe_close_transport(self, fd): | ||
| if fd in self._pipe_fds: | ||
| self._pipe_fds.remove(fd) | ||
| if len(self._pipe_fds) == 0: |
There was a problem hiding this comment.
Shouldn't this if len(...) be dedented?
Sorry, something went wrong.
There was a problem hiding this comment.
I guess that's true. My logic is we know that if nothing gets removed it won't be closed.
Sorry, something went wrong.
...removal from fd list does not occur.
| self._limit = limit | ||
| self.stdin = self.stdout = self.stderr = None | ||
| self._transport = None | ||
| self._pipe_fds = [-1] |
There was a problem hiding this comment.
What does -1 mean here?
Sorry, something went wrong.
There was a problem hiding this comment.
I should probably add a comment. -1 is just the token for "process_exited" meaning we won't close a Transport until the process exits and all the pipes are done.
Sorry, something went wrong.
There was a problem hiding this comment.
Should I use a better sentinel object than -1?
Sorry, something went wrong.
There was a problem hiding this comment.
Ah, interesting. I'd add a separate boolean attribute for that.
Sorry, something went wrong.
There was a problem hiding this comment.
Sure thing!
Sorry, something went wrong.
| reader.feed_eof() | ||
| else: | ||
| reader.set_exception(exc) | ||
| self._maybe_close_transport(fd) |
There was a problem hiding this comment.
I'd simply always call this method in pipe_connection_lost. Makes the code simpler to follow, and the logic with if statements should be (as they currently are) in _maybe_close_transport.
Sorry, something went wrong.
There was a problem hiding this comment.
Sure, just dedent that line then?
Sorry, something went wrong.
There was a problem hiding this comment.
yep.
Sorry, something went wrong.
There was a problem hiding this comment.
Alright, just wanted to make sure I was understanding that comment correctly. :)
Sorry, something went wrong.
..._pipe_fds and change interface of _maybe_close_transport to not take an fd.
|
Can you please close this PR and make a new one to http://github.com/python/cpython (with a link to this discussion and review). It would make merging this way easier for me. |
Sorry, something went wrong.
|
So I made another change to _maybe_close_transport() to accommodate the flag for process exit. |
Sorry, something went wrong.
|
@1st1 Oh, sure! Can I do this when I'm home from work? Don't have my actual environment all setup here, making do with the GitHub web interface. :) |
Sorry, something went wrong.
|
I like it now. Thanks for opening the new PR! I'll close this one. |
Sorry, something went wrong.
| Back | FazBrowse Home | New Git URL |
I believe this change fixes #484.
Delays the closing for SubprocessStreamProtocol._transport until all pipes have been closed and the process has exited rather than just the process exiting. This allows for reading data from the subprocess that is still pending in the pipe after the process has exited.
I haven't run tests or created a test for this exact issue but I will create a few tests later.