bpo-30068: add missing iter(self) in _io._IOBase.readlines when hint is present #1130
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
zhangyangyu
added
type-bug
|
@zhangyangyu, thanks for your PR! By analyzing the history of the files in this pull request, we identified @benjaminp, @serhiy-storchaka and @ezio-melotti to be potential reviewers. |
serhiy-storchaka
requested changes
Apr 14, 2017
Modules/_io/iobase.c
Outdated
| @@ -666,7 +666,13 @@ _io__IOBase_readlines_impl(PyObject *self, Py_ssize_t hint) | |||
| } | |||
|
|
|||
| while (1) { | |||
| PyObject *line = PyIter_Next(self); | |||
| PyObject *it, *line; | |||
| it = PyObject_GetIter(self); | |||
There was a problem hiding this comment.
This should be outside of the loop.
Misc/NEWS
Outdated
| - bpo-30068: _io._IOBase.readlines will check if it's closed first when | ||
| hint is present. | ||
|
|
||
| - bpo-29692: Fixed arbitrary unchaining of RuntimeError exceptions in |
There was a problem hiding this comment.
Would be better not move this entry.
serhiy-storchaka
requested changes
Apr 14, 2017
| @@ -665,8 +665,14 @@ _io__IOBase_readlines_impl(PyObject *self, Py_ssize_t hint) | |||
| return result; | |||
| } | |||
|
|
|||
| it = PyObject_GetIter(self); | |||
serhiy-storchaka
approved these changes
Apr 14, 2017
Modules/_io/iobase.c
Outdated
| return result; | ||
| error: |
There was a problem hiding this comment.
Tiny nit: I prefer to add an empty line after return and before a label.
zhangyangyu
added a commit
to zhangyangyu/cpython
that referenced
this pull request
Apr 15, 2017
zhangyangyu
added a commit
to zhangyangyu/cpython
that referenced
this pull request
Apr 15, 2017
This was referenced Apr 15, 2017
zhangyangyu
added a commit
to zhangyangyu/cpython
that referenced
this pull request
Apr 15, 2017
zhangyangyu
added a commit
that referenced
this pull request
Apr 15, 2017
zhangyangyu
added a commit
that referenced
this pull request
Apr 15, 2017
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.
No description provided.