-
-
Notifications
You must be signed in to change notification settings - Fork 32k
csv readers take iterables as well as iterators #2653
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,8 +56,9 @@ The :mod:`csv` module defines the following functions: | |
.. function:: reader(csvfile, dialect='excel', **fmtparams) | ||
|
||
Return a reader object which will iterate over lines in the given *csvfile*. | ||
*csvfile* can be any object which supports the :term:`iterator` protocol and returns a | ||
string each time its :meth:`!__next__` method is called --- :term:`file objects | ||
*csvfile* can be any object which supports the :term:`iterable` protocol and returns an | ||
iterator that returns a string each time its :term`iterator`'s :meth:`!__next__` method | ||
is called when its :meth:`!__iter__` method is called --- :term:`file objects | ||
<file object>` and list objects are both suitable. If *csvfile* is a file object, | ||
it should be opened with ``newline=''``. [1]_ An optional | ||
*dialect* parameter can be given which is used to define a set of parameters | ||
|
@@ -416,7 +417,7 @@ Reader objects have the following public attributes: | |
|
||
.. attribute:: csvreader.line_num | ||
|
||
The number of lines read from the source iterator. This is not the same as the | ||
The number of lines read from the source iterable. This is not the same as the | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why change this? If there is only one iterator involved, the original would be more precise. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That's a good point, iterator is more correct here. |
||
number of records returned, as records can span multiple lines. | ||
|
||
|
||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would suggest instead changing the original with the following minimal change:
...can be any iterable object whose iterator returns a string each time its...