-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
BUG: Help python csv engine read binary buffers #27925
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
Merged
Merged
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
5e3c3e3
BUG: Help python csv engine read binary buffers
fiendish 0ac1bce
whatsnew entry
fiendish 7e270d2
satisfy gh-14418 for binary mode files
fiendish b3b9d2f
update tests per requested changes
fiendish 0a60af2
move whatsnew note to 1.0
fiendish 9d73aaa
black formatting
fiendish 03bceb1
BytesIO is a subclass of BufferedIOBase
fiendish ab0878d
black formatting
fiendish d662532
remove no_close and compare with non-open read
fiendish 01741dc
Merge branch 'master' into patch-1
fiendish 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
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 |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
import csv | ||
import gzip | ||
from http.client import HTTPException # noqa | ||
from io import BytesIO | ||
from io import BufferedIOBase, BytesIO | ||
import lzma | ||
import mmap | ||
import os | ||
|
@@ -342,9 +342,11 @@ def _get_handle( | |
try: | ||
from s3fs import S3File | ||
|
||
need_text_wrapping = (BytesIO, S3File) | ||
need_text_wrapping = (BufferedIOBase, BytesIO, S3File) | ||
except ImportError: | ||
need_text_wrapping = (BytesIO,) | ||
need_text_wrapping = (BufferedIOBase, BytesIO) | ||
|
||
no_close = BufferedIOBase | ||
|
||
handles = list() | ||
f = path_or_buf | ||
|
@@ -420,8 +422,10 @@ def _get_handle( | |
if is_text and (compression or isinstance(f, need_text_wrapping)): | ||
from io import TextIOWrapper | ||
|
||
f = TextIOWrapper(f, encoding=encoding, newline="") | ||
handles.append(f) | ||
g = TextIOWrapper(f, encoding=encoding, newline="") | ||
if not isinstance(f, no_close): | ||
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. this is hard to follow, can you just use BufferedIOBase here rather than no_close? |
||
handles.append(g) | ||
f = g | ||
|
||
if memory_map and hasattr(f, "fileno"): | ||
try: | ||
|
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
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.
Uh oh!
There was an error while loading. Please reload this page.