Skip to content

REF: simplify dt64 formatter functions #37907

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 1 commit into from
Nov 17, 2020
Merged

REF: simplify dt64 formatter functions #37907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pandas/core/indexes/datetimes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ def _formatter_func(self):
from pandas.io.formats.format import get_format_datetime64

formatter = get_format_datetime64(is_dates_only=self._is_dates_only)
return lambda x: f"'{formatter(x, tz=self.tz)}'"
return lambda x: f"'{formatter(x)}'"

# --------------------------------------------------------------------
# Set Operation Methods
Expand Down
37 changes: 12 additions & 25 deletions pandas/io/formats/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

from contextlib import contextmanager
from csv import QUOTE_NONE, QUOTE_NONNUMERIC
from datetime import tzinfo
import decimal
from functools import partial
from io import StringIO
Expand Down Expand Up @@ -36,7 +35,6 @@

from pandas._libs import lib
from pandas._libs.missing import NA
from pandas._libs.tslib import format_array_from_datetime
from pandas._libs.tslibs import NaT, Timedelta, Timestamp, iNaT
from pandas._libs.tslibs.nattype import NaTType
from pandas._typing import (
Expand Down Expand Up @@ -1529,11 +1527,9 @@ def _format_strings(self) -> List[str]:
if self.formatter is not None and callable(self.formatter):
return [self.formatter(x) for x in values]

fmt_values = format_array_from_datetime(
values.asi8.ravel(),
format=get_format_datetime64_from_values(values, self.date_format),
na_rep=self.nat_rep,
).reshape(values.shape)
fmt_values = values._data._format_native_types(
na_rep=self.nat_rep, date_format=self.date_format
)
return fmt_values.tolist()


Expand Down Expand Up @@ -1653,46 +1649,37 @@ def is_dates_only(
return False


def _format_datetime64(
x: Union[NaTType, Timestamp], tz: Optional[tzinfo] = None, nat_rep: str = "NaT"
) -> str:
if x is None or (is_scalar(x) and isna(x)):
def _format_datetime64(x: Union[NaTType, Timestamp], nat_rep: str = "NaT") -> str:
if x is NaT:
return nat_rep

if tz is not None or not isinstance(x, Timestamp):
if getattr(x, "tzinfo", None) is not None:
x = Timestamp(x).tz_convert(tz)
else:
x = Timestamp(x).tz_localize(tz)

return str(x)


def _format_datetime64_dateonly(
x: Union[NaTType, Timestamp], nat_rep: str = "NaT", date_format: None = None
x: Union[NaTType, Timestamp],
nat_rep: str = "NaT",
date_format: Optional[str] = None,
) -> str:
if x is None or (is_scalar(x) and isna(x)):
if x is NaT:
return nat_rep

if not isinstance(x, Timestamp):
x = Timestamp(x)

if date_format:
return x.strftime(date_format)
else:
return x._date_repr


def get_format_datetime64(
is_dates_only: bool, nat_rep: str = "NaT", date_format: None = None
is_dates_only: bool, nat_rep: str = "NaT", date_format: Optional[str] = None
) -> Callable:

if is_dates_only:
return lambda x, tz=None: _format_datetime64_dateonly(
return lambda x: _format_datetime64_dateonly(
x, nat_rep=nat_rep, date_format=date_format
)
else:
return lambda x, tz=None: _format_datetime64(x, tz=tz, nat_rep=nat_rep)
return lambda x: _format_datetime64(x, nat_rep=nat_rep)


def get_format_datetime64_from_values(
Expand Down