FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-29692: contextlib.contextmanager may incorrectly unchain RuntimeError by soolabettu · Pull Request #949 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

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

Merged
ncoghlan merged 1 commit into
python:masterfrom
soolabettu:bpo-29692
Apr 11, 2017
ConversationCommits (1)ChecksFiles changed
Merged

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

Conversation

soolabettu commented Apr 1, 2017

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 commented Apr 1, 2017

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.

serhiy-storchaka reviewed Apr 1, 2017
View reviewed changes
Comment thread Lib/contextlib.py Outdated

serhiy-storchaka Apr 1, 2017

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

@ncoghlan suggested to drop this else: clause.

Comment thread Lib/test/test_contextlib.py Outdated

serhiy-storchaka Apr 1, 2017

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Is this needed in 3.7?

Comment thread Lib/test/test_contextlib.py Outdated

serhiy-storchaka Apr 1, 2017

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

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

Comment thread Lib/test/test_contextlib.py Outdated

serhiy-storchaka Apr 1, 2017

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

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

serhiy-storchaka Apr 1, 2017

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

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

serhiy-storchaka commented Apr 1, 2017

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 force-pushed the bpo-29692 branch 2 times, most recently from ecf5deb to 9538527 Compare April 2, 2017 11:15

soolabettu commented Apr 2, 2017

Copy link
Copy Markdown
Contributor Author

Implemented all changes, please review, thanks.

serhiy-storchaka reviewed Apr 2, 2017
View reviewed changes
Comment thread Lib/test/test_contextlib.py Outdated

serhiy-storchaka Apr 2, 2017

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

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

Comment thread Lib/test/test_contextlib.py Outdated

serhiy-storchaka Apr 2, 2017

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

assertIsNone()

Comment thread Misc/NEWS Outdated

serhiy-storchaka Apr 2, 2017

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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Add periods after sentence ends.

soolabettu commented Apr 2, 2017

Copy link
Copy Markdown
Contributor Author

@serhiy-storchaka , thanks for the review.

soolabettu commented Apr 10, 2017

Copy link
Copy Markdown
Contributor Author

@ncoghlan could you please review the changes? Thanks

ncoghlan approved these changes Apr 11, 2017
View reviewed changes

ncoghlan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Latest version looks good to me.

ncoghlan merged commit 00c75e9 into python:master Apr 11, 2017

ncoghlan commented Apr 11, 2017

Copy link
Copy Markdown
Contributor

Thanks for the fix, @svelankar!

Mariatta mentioned this pull request Apr 13, 2017
Merged
Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Apr 13, 2017
[3.6] bpo-29692: contextlib.contextmanager may incorrectly unchain Ru…
ac4f95c 
…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 mentioned this pull request Apr 13, 2017
Merged
Mariatta added a commit that referenced this pull request Apr 13, 2017
[3.6] bpo-29692: contextlib.contextmanager may incorrectly unchain Ru…
9b409ff 
…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
[3.5] bpo-29692: contextlib.contextmanager may incorrectly unchain Ru…
b17138f 
…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 mentioned this pull request Apr 13, 2017
Merged
Mariatta added a commit that referenced this pull request Apr 13, 2017
[3.5] bpo-29692: contextlib.contextmanager may incorrectly unchain Ru…
4d015a4 
…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)
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

ncoghlan ncoghlan approved these changes
serhiy-storchaka serhiy-storchaka approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

Back | FazBrowse Home | New Git URL