Skip to content

Assert at least one tz arg is always UTC #18228

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

Merged
merged 7 commits into from
Nov 12, 2017
Merged

Assert at least one tz arg is always UTC #18228

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
81f8a33
Assert at least one tz arg is always UTC
jbrockmendel Nov 11, 2017
65f001d
update asserts
jbrockmendel Nov 11, 2017
563510c
edit comment per reviewer suggestion
jbrockmendel Nov 11, 2017
359aeff
only assert for tz_convert_single
jbrockmendel Nov 11, 2017
17dd7ab
typo fix
jbrockmendel Nov 11, 2017
c1aa846
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Nov 12, 2017
754dd7b
edit per reviewer request
jbrockmendel Nov 12, 2017
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
9 changes: 6 additions & 3 deletions pandas/_libs/tslibs/conversion.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ cpdef int64_t tz_convert_single(int64_t val, object tz1, object tz2):
"""
Convert the val (in i8) from timezone1 to timezone2

This is a single timezone versoin of tz_convert
This is a single timezone version of tz_convert

Parameters
----------
Expand All @@ -422,6 +422,9 @@ cpdef int64_t tz_convert_single(int64_t val, object tz1, object tz2):
pandas_datetimestruct dts
datetime dt

# See GH#17734 We should always be converting either from UTC or to UTC
assert (is_utc(tz1) or tz1 == 'UTC') or (is_utc(tz2) or tz2 == 'UTC')

if val == NPY_NAT:
return val

Expand All @@ -444,8 +447,8 @@ cpdef int64_t tz_convert_single(int64_t val, object tz1, object tz2):

if get_timezone(tz2) == 'UTC':
return utc_date
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

return val (see my comment below)

if is_tzlocal(tz2):
dt64_to_dtstruct(val, &dts)
elif is_tzlocal(tz2):
dt64_to_dtstruct(utc_date, &dts)
dt = datetime(dts.year, dts.month, dts.day, dts.hour,
dts.min, dts.sec, dts.us, tz2)
delta = int(get_utcoffset(tz2, dt).total_seconds()) * 1000000000
Expand Down