Skip to content

REF: dispatch DatetimeBlock.to_native_types to DTA._format_native_types #33249

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 4 commits into from
Apr 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions pandas/core/arrays/datetimes.py
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,8 @@ def _format_native_types(self, na_rep="NaT", date_format=None, **kwargs):
fmt = _get_format_datetime64_from_values(self, date_format)

return tslib.format_array_from_datetime(
self.asi8, tz=self.tz, format=fmt, na_rep=na_rep
)
self.asi8.ravel(), tz=self.tz, format=fmt, na_rep=na_rep
).reshape(self.shape)

# -----------------------------------------------------------------
# Comparison Methods
Expand Down
22 changes: 7 additions & 15 deletions pandas/core/internals/blocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import numpy as np

from pandas._libs import NaT, Timestamp, algos as libalgos, lib, tslib, writers
from pandas._libs import NaT, Timestamp, algos as libalgos, lib, writers
import pandas._libs.internals as libinternals
from pandas._libs.tslibs import Timedelta, conversion
from pandas._libs.tslibs.timezones import tz_compare
Expand Down Expand Up @@ -2116,21 +2116,13 @@ def _can_hold_element(self, element: Any) -> bool:

return is_valid_nat_for_dtype(element, self.dtype)

def to_native_types(self, na_rep=None, date_format=None, quoting=None, **kwargs):
""" convert to our native types format, slicing if desired """
values = self.values
i8values = self.values.view("i8")

from pandas.io.formats.format import _get_format_datetime64_from_values

fmt = _get_format_datetime64_from_values(values, date_format)
def to_native_types(self, na_rep="NaT", date_format=None, **kwargs):
""" convert to our native types format """
dta = self.array_values()

result = tslib.format_array_from_datetime(
i8values.ravel(),
tz=getattr(self.values, "tz", None),
format=fmt,
na_rep=na_rep,
).reshape(i8values.shape)
result = dta._format_native_types(
na_rep=na_rep, date_format=date_format, **kwargs
)
return np.atleast_2d(result)

def set(self, locs, values):
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/formats/format.py
Original file line number Diff line number Diff line change
Expand Up @@ -1547,7 +1547,7 @@ def _is_dates_only(
values: Union[np.ndarray, DatetimeArray, Index, DatetimeIndex]
) -> bool:
# return a boolean if we are only dates (and don't have a timezone)
assert values.ndim == 1
values = values.ravel()

values = DatetimeIndex(values)
if values.tz is not None:
Expand Down