Difference between calamine and openpyxl readers fixed #59188
+18
−14
Conversation
This file contains 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
rhshadrach
requested changes
Jul 7, 2024
| StorageOptions, | ||
| ) | ||
|
|
||
| _CellValue = Union[int, float, str, bool, time, date, datetime, timedelta] | ||
| _CellValueT = Union[int, float, str, bool, time, date, datetime, timedelta] |
There was a problem hiding this comment.
Why is this changing? I think we only use T suffix for TypeVar, not type aliases.
| def _convert_cell(value: _CellValue) -> Scalar | NaTType | time: | ||
| ) -> list[list[Scalar]]: | ||
| def _convert_cell(value: _CellValueT) -> Scalar: | ||
| # Avoid explicit conversion to pd.Timestamp and pd.Timedelta |
There was a problem hiding this comment.
I don't think this comment is necessary/helpful.
Comment on lines
110
to
+114
| elif isinstance(value, date): | ||
| return pd.Timestamp(value) | ||
| return value | ||
| elif isinstance(value, timedelta): | ||
| return pd.Timedelta(value) | ||
| elif isinstance(value, time): | ||
| return value | ||
| elif isinstance(value, time): |
There was a problem hiding this comment.
I think these can just be removed. We only need elif instance(value, ...) if we are going to do something besides just returning value.
Comment on lines
+120
to
+126
| rows: list[list[_CellValueT]] = sheet.to_python(skip_empty_area=False) | ||
| data: list[list[Scalar]] = [] | ||
|
|
||
| for row in rows: | ||
| data.append([_convert_cell(cell) for cell in row]) | ||
| if file_rows_needed is not None and len(data) >= file_rows_needed: | ||
| break |
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.
doc/source/whatsnew/vX.X.X.rstfile if fixing a bug or adding a new feature.