Skip to content
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.

Sign up for GitHub

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

Jump to bottom

BUG: don't suppress OSError in tzlocal #37652

Merged
merged 2 commits into from
Nov 6, 2020
Merged

BUG: don't suppress OSError in tzlocal #37652

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
095a631
CI: troubleshoot win py38 builds
jbrockmendel Nov 3, 2020
fb98449
Merge branch 'master' of https://github.com/pandas-dev/pandas into ca…
jbrockmendel Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pandas/_libs/tslibs/tzconversion.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,9 +500,11 @@ cdef int64_t[:] _tz_convert_from_utc(const int64_t[:] vals, tzinfo tz):
return converted


# OSError may be thrown by tzlocal on windows at or close to 1970-01-01
# see https://github.com/pandas-dev/pandas/pull/37591#issuecomment-720628241
cdef inline int64_t _tzlocal_get_offset_components(int64_t val, tzinfo tz,
bint to_utc,
bint *fold=NULL):
bint *fold=NULL) except? -1:
"""
Calculate offset in nanoseconds needed to convert the i8 representation of
a datetime from a tzlocal timezone to UTC, or vice-versa.
Expand Down