Skip to content

bpo-29692: contextlib.contextmanager may incorrectly unchain RuntimeError#949

Merged
ncoghlan merged 1 commit into
python:masterfrom
soolabettu:bpo-29692
Apr 11, 2017
Merged

bpo-29692: contextlib.contextmanager may incorrectly unchain RuntimeError#949
ncoghlan merged 1 commit into
python:masterfrom
soolabettu:bpo-29692

Conversation

@soolabettu
Copy link
Copy Markdown
Contributor

@ncoghlan @serhiy-storchaka @JelleZijlstra @brettcannon
I had to close PR 891 and open a new PR due to an incorrect rebase on my part.
All review comments made in PR 891 have been implemented and a test case added, please review, thanks.

@mention-bot
Copy link
Copy Markdown

@svelankar, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ncoghlan, @berkerpeksag and @Yhg1s to be potential reviewers.

Comment thread Lib/contextlib.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ncoghlan suggested to drop this else: clause.

Comment thread Lib/test/test_contextlib.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed in 3.7?

Comment thread Lib/test/test_contextlib.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add some argument to the raised RuntimeError for checking that the correct RuntimeError is caught.

Comment thread Lib/test/test_contextlib.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check that this is a RuntimeError raised by test_issue29692, not some other RuntimeError. Check it's __cause__ (it should be ZeroDivisionError, right?).

Comment thread Lib/test/test_contextlib.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if raise StopIteration? I think this case should be tested too.

@serhiy-storchaka
Copy link
Copy Markdown
Member

Please add an entry in Misc/NEWS at the start of the "Library" section. Don't forget "Patch by ."

@soolabettu soolabettu force-pushed the bpo-29692 branch 2 times, most recently from ecf5deb to 9538527 Compare April 2, 2017 11:15
@soolabettu
Copy link
Copy Markdown
Contributor Author

Implemented all changes, please review, thanks.

Comment thread Lib/test/test_contextlib.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since from __future__ import generator_stop no longer used, the trick with exec() no longer needed.

Comment thread Lib/test/test_contextlib.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

assertIsNone()

Comment thread Misc/NEWS Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add periods after sentence ends.

@soolabettu
Copy link
Copy Markdown
Contributor Author

@serhiy-storchaka , thanks for the review.

@soolabettu
Copy link
Copy Markdown
Contributor Author

@ncoghlan could you please review the changes? Thanks

Copy link
Copy Markdown
Contributor

@ncoghlan ncoghlan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest version looks good to me.

@ncoghlan ncoghlan merged commit 00c75e9 into python:master Apr 11, 2017
@ncoghlan
Copy link
Copy Markdown
Contributor

Thanks for the fix, @svelankar!

@Mariatta Mariatta mentioned this pull request Apr 13, 2017
Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Apr 13, 2017
…ntimeError (pythonGH-949)

contextlib._GeneratorContextManager.__exit__ includes a special case to deal with
PEP 479 RuntimeErrors created when `StopIteration` is thrown into the context
manager body.

Previously this check was too permissive, and undid one level of chaining on *all*
RuntimeError instances, not just those that wrapped a StopIteration instance.
(cherry picked from commit 00c75e9)
Mariatta added a commit that referenced this pull request Apr 13, 2017
…ntimeError (GH-949) (#1105)

contextlib._GeneratorContextManager.__exit__ includes a special case to deal with
PEP 479 RuntimeErrors created when `StopIteration` is thrown into the context
manager body.

Previously this check was too permissive, and undid one level of chaining on *all*
RuntimeError instances, not just those that wrapped a StopIteration instance.
(cherry picked from commit 00c75e9)
Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Apr 13, 2017
…ntimeError (pythonGH-949)

contextlib._GeneratorContextManager.__exit__ includes a special case to deal with
PEP 479 RuntimeErrors created when `StopIteration` is thrown into the context
manager body.

Previously this check was too permissive, and undid one level of chaining on *all*
RuntimeError instances, not just those that wrapped a StopIteration instance.
(cherry picked from commit 00c75e9)
Mariatta added a commit that referenced this pull request Apr 13, 2017
…ntimeError (GH-949) (#1107)

contextlib._GeneratorContextManager.__exit__ includes a special case to deal with
PEP 479 RuntimeErrors created when `StopIteration` is thrown into the context
manager body.

Previously this check was too permissive, and undid one level of chaining on *all*
RuntimeError instances, not just those that wrapped a StopIteration instance.
(cherry picked from commit 00c75e9)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants