-
-
Notifications
You must be signed in to change notification settings - Fork 18.6k
BUG: Fix TypeError caused by GH13374 #17465
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 3 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
edb9337
Fixes a bug introduced by #13374
8d9ac4b
BUG: Fixed bug caused by GH13374
ced6fc6
CLN: PEP8 for GH17465
4b3d5de
Merge branch 'master' of https://github.com/pandas-dev/pandas into py…
4745d6d
TST: Added test for gh-13374
6896727
TST: remove iterator option from test
5a9ee56
TST: document test for gh-17465
matthax e9e5e97
Merge branch 'master' of https://github.com/pandas-dev/pandas into py…
matthax a24b96f
CLN: change code and comment to meet guidelines
matthax f151405
CLN: fix code format for pep8
matthax 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 |
---|---|---|
|
@@ -2836,7 +2836,8 @@ def _rows_to_cols(self, content): | |
for row_num, actual_len in bad_lines: | ||
msg = ('Expected %d fields in line %d, saw %d' % | ||
(col_len, row_num + 1, actual_len)) | ||
if len(self.delimiter) > 1 and self.quoting != csv.QUOTE_NONE: | ||
if self.delimiter and \ | ||
len(self.delimiter) > 1 and self.quoting != csv.QUOTE_NONE: | ||
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. Generally practice for is to use parentheses around the conditionals and not to use the slash for something a little nicer to read i.e.: if (self.delimiter and
len(self.delimiter) > 1...) |
||
# see gh-13374 | ||
reason = ('Error could possibly be due to quotes being ' | ||
'ignored when a multi-char delimiter is used.') | ||
|
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.
use double-back-ticks around
TypeError
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.
add:
rather than the correct error message.
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.
updated both. Looks like you're going to have to manually restart the travis build though, something went wrong there and I'm not able to see any log info.