ERR: Raise ValueError with naive datetime and mixed UTC offsets #25982
Conversation
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
mroeschke
added
Error Reporting
Codecov Report
@@ Coverage Diff @@
## master #25982 +/- ##
==========================================
- Coverage 91.85% 91.84% -0.01%
==========================================
Files 175 175
Lines 52554 52554
==========================================
- Hits 48272 48268 -4
- Misses 4282 4286 +4
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## master #25982 +/- ##
==========================================
- Coverage 91.86% 91.85% -0.01%
==========================================
Files 175 175
Lines 52543 52543
==========================================
- Hits 48267 48262 -5
- Misses 4276 4281 +5
Continue to review full report at Codecov.
|
jbrockmendel
reviewed
Apr 4, 2019
doc/source/whatsnew/v0.25.0.rst
Outdated
| @@ -283,6 +283,7 @@ Timezones | |||
| - Bug in :func:`Timestamp.tz_localize` and :func:`Timestamp.tz_convert` does not propagate ``freq`` (:issue:`25241`) | |||
| - Bug in :func:`Series.at` where setting :class:`Timestamp` with timezone raises ``TypeError`` (:issue:`25506`) | |||
| - Bug in :func:`DataFrame.update` when updating with timezone aware data would return timezone naive data (:issue:`25807`) | |||
| - Bug in :func:`to_datetime` where an uninformative ``RuntimeError`` was raised when passing a native :class:`Timestamp` with datetime strings with mixed UTC offsets (:issue:`25978`) | |||
jbrockmendel
reviewed
Apr 4, 2019
pandas/_libs/tslib.pyx
Outdated
| @@ -792,7 +792,7 @@ cdef array_to_datetime_object(ndarray[object] values, bint is_raise, | |||
| # 2) datetime strings, which we return as datetime.datetime | |||
| for i in range(n): | |||
| val = values[i] | |||
| if checknull_with_nat(val): | |||
| if checknull_with_nat(val) or isinstance(val, datetime): | |||
jreback
reviewed
Apr 4, 2019
pandas/_libs/tslib.pyx
Outdated
| @@ -792,7 +792,7 @@ cdef array_to_datetime_object(ndarray[object] values, bint is_raise, | |||
| # 2) datetime strings, which we return as datetime.datetime | |||
| for i in range(n): | |||
| val = values[i] | |||
| if checknull_with_nat(val): | |||
| if checknull_with_nat(val) or isinstance(val, datetime): | |||
There was a problem hiding this comment.
can yo u add a comment here, it is non-obvious why this change works
|
Comments addressed and green. |
|
thanks @mroeschke |
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.
git diff upstream/master -u -- "*.py" | flake8 --diff