-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
REF: avoid catching and re-raising in datetime parsing #50629
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 all commits
Commits
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -520,43 +520,35 @@ cdef _TSObject _convert_str_to_tsobject(object ts, tzinfo tz, str unit, | |
) | ||
if not string_to_dts_failed: | ||
reso = get_supported_reso(out_bestunit) | ||
try: | ||
check_dts_bounds(&dts, reso) | ||
if out_local == 1: | ||
return _create_tsobject_tz_using_offset( | ||
dts, out_tzoffset, tz, reso | ||
check_dts_bounds(&dts, reso) | ||
if out_local == 1: | ||
return _create_tsobject_tz_using_offset( | ||
dts, out_tzoffset, tz, reso | ||
) | ||
else: | ||
ival = npy_datetimestruct_to_datetime(reso, &dts) | ||
if tz is not None: | ||
# shift for _localize_tso | ||
ival = tz_localize_to_utc_single( | ||
ival, tz, ambiguous="raise", nonexistent=None, creso=reso | ||
) | ||
else: | ||
ival = npy_datetimestruct_to_datetime(reso, &dts) | ||
if tz is not None: | ||
# shift for _localize_tso | ||
ival = tz_localize_to_utc_single( | ||
ival, tz, ambiguous="raise", nonexistent=None, creso=reso | ||
) | ||
obj = _TSObject() | ||
obj.dts = dts | ||
obj.value = ival | ||
obj.creso = reso | ||
maybe_localize_tso(obj, tz, obj.creso) | ||
return obj | ||
|
||
except OutOfBoundsDatetime: | ||
# GH#19382 for just-barely-OutOfBounds falling back to dateutil | ||
# parser will return incorrect result because it will ignore | ||
# nanoseconds | ||
raise | ||
|
||
except ValueError: | ||
# Fall through to parse_datetime_string | ||
pass | ||
obj = _TSObject() | ||
obj.dts = dts | ||
obj.value = ival | ||
obj.creso = reso | ||
maybe_localize_tso(obj, tz, obj.creso) | ||
return obj | ||
|
||
try: | ||
# TODO: use the one that returns reso | ||
dt = parse_datetime_string( | ||
ts, dayfirst=dayfirst, yearfirst=yearfirst | ||
) | ||
except (ValueError, OverflowError) as err: | ||
raise ValueError("could not convert string to Timestamp") from err | ||
except ValueError as err: | ||
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. looks like there was no test which hit the |
||
if "out of range for month" in str(err): | ||
# dateutil raised when constructing a datetime object, | ||
# let's give a nicer exception message | ||
raise ValueError("could not convert string to Timestamp") from err | ||
raise | ||
|
||
return convert_datetime_to_tsobject(dt, tz) | ||
|
||
|
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
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.
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.
looks like this was uncovered, so OK to remove