-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
BUG: Fix the error when reading the compressed UTF-16 file #18091
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
jreback
merged 7 commits into
pandas-dev:master
from
Licht-T:fix-read-zipped-utf-16-file
Nov 4, 2017
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
973a2d8
BUG: Fix the error when reading the compressed UTF-16 file
Licht-T 52d4266
TST: Add test for reading the zipped UTF-16 file
Licht-T abfdadd
DOC: Add comments about UTF-16 source conversion
Licht-T bacf224
DOC: Add whatsnew note about fixing the bug of reading compressed UTF…
Licht-T b2a3f97
TST: Move and change the test case
Licht-T 012b496
Use parentheses instead of the backslash to wrap multi-line conditional
Licht-T 1a06857
Add comment for encoding settings
Licht-T 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 |
---|---|---|
|
@@ -374,6 +374,17 @@ cdef class TextReader: | |
float_precision=None, | ||
skip_blank_lines=True): | ||
|
||
# encoding | ||
if encoding is not None: | ||
if not isinstance(encoding, bytes): | ||
encoding = encoding.encode('utf-8') | ||
encoding = encoding.lower() | ||
self.c_encoding = <char*> encoding | ||
else: | ||
self.c_encoding = NULL | ||
|
||
self.encoding = encoding | ||
|
||
self.parser = parser_new() | ||
self.parser.chunksize = tokenize_chunksize | ||
|
||
|
@@ -495,17 +506,6 @@ cdef class TextReader: | |
self.parser.double_converter_nogil = NULL | ||
self.parser.double_converter_withgil = round_trip | ||
|
||
# encoding | ||
if encoding is not None: | ||
if not isinstance(encoding, bytes): | ||
encoding = encoding.encode('utf-8') | ||
encoding = encoding.lower() | ||
self.c_encoding = <char*> encoding | ||
else: | ||
self.c_encoding = NULL | ||
|
||
self.encoding = encoding | ||
|
||
if isinstance(dtype, dict): | ||
dtype = {k: pandas_dtype(dtype[k]) | ||
for k in dtype} | ||
|
@@ -684,6 +684,14 @@ cdef class TextReader: | |
else: | ||
raise ValueError('Unrecognized compression type: %s' % | ||
self.compression) | ||
|
||
if b'utf-16' in (self.encoding or b''): | ||
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. can you add a comment here on what is going on |
||
# we need to read utf-16 through UTF8Recoder. | ||
# if source is utf-16, convert source to utf-8 by UTF8Recoder. | ||
source = com.UTF8Recoder(source, self.encoding.decode('utf-8')) | ||
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. can you add a short 'why' we are doing this? |
||
self.encoding = b'utf-8' | ||
self.c_encoding = <char*> self.encoding | ||
|
||
self.handle = source | ||
|
||
if isinstance(source, basestring): | ||
|
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
Binary file not shown.
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 know that you copied and pasted this, but let's take this opportunity to provide a much-more informative comment about this whole block of logic (a sentence is sufficient).