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: fix to_datetime(dti, utc=True) #27733

Merged
merged 5 commits into from Aug 5, 2019
Merged

BUG: fix to_datetime(dti, utc=True) #27733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90eb285
BUG: fix to_datetime(dti, utc=True)
jbrockmendel Aug 3, 2019
624437e
whatsnew, suggested edits
jbrockmendel Aug 4, 2019
2226635
parametrize
jbrockmendel Aug 4, 2019
84c85d3
Merge branch 'master' of https://github.com/pandas-dev/pandas into todt
jbrockmendel Aug 4, 2019
b0d8fbc
backquotes
jbrockmendel Aug 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/source/whatsnew/v0.25.1.rst
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ Categorical

Datetimelike
^^^^^^^^^^^^

- Bug in :func:`to_datetime` where passing a timezone-naive :class:`DatetimeArray` or :class:`DatetimeIndex` and ``utc=True`` would incorrectly return a timezone-naive result (:issue:`27733`)
-
-
-
Expand Down
3 changes: 3 additions & 0 deletions pandas/core/tools/datetimes.py
View file
Open in desktop
Expand Up @@ -334,6 +334,9 @@ def _convert_listlike_datetimes(
return DatetimeIndex(arg, tz=tz, name=name)
except ValueError:
pass
elif tz:
Copy link
Member

Choose a reason for hiding this comment

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

I think this would fail if a user passes to_datetime(np.array([...], dtype='datetime64[ns]'), utc=True)?

I was thinking more:

if box:
    if not isinstance(arg, (DatetimeArray, ...)):
        ....
    elif tz:
        ...

Copy link
Member Author

Choose a reason for hiding this comment

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

>>> arr = np.arange(2).astype('datetime64[ns]')
>>> to_datetime(arr, utc=True)
DatetimeIndex(['1970-01-01 00:00:00+00:00', '1970-01-01 00:00:00.000000001+00:00'], dtype='datetime64[ns, UTC]', freq=None)

or are you suggesting that this is wrong because box=True was not passed?

Copy link
Member

Choose a reason for hiding this comment

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

Oh! It does work. box=True is the default so this looks correct.

# DatetimeArray, DatetimeIndex
return arg.tz_localize(tz)

return arg

Expand Down
12 changes: 12 additions & 0 deletions pandas/tests/indexes/datetimes/test_tools.py
View file
Open in desktop
Expand Up @@ -1623,6 +1623,18 @@ def test_dayfirst(self, cache):
tm.assert_index_equal(expected, idx5)
tm.assert_index_equal(expected, idx6)

@pytest.mark.parametrize("klass", [DatetimeIndex, DatetimeArray])
def test_to_datetime_dta_tz(self, klass):
# GH#27733
dti = date_range("2015-04-05", periods=3).rename("foo")
jreback marked this conversation as resolved.
Show resolved Hide resolved
expected = dti.tz_localize("UTC")

jreback marked this conversation as resolved.
Show resolved Hide resolved
obj = klass(dti)
expected = klass(expected)

result = to_datetime(obj, utc=True)
tm.assert_equal(result, expected)


class TestGuessDatetimeFormat:
@td.skip_if_not_us_locale
Expand Down