Skip to content

BUG: fix+test op(NaT, ndarray), also simplify #27807

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 9 commits into from
Aug 15, 2019

Conversation

jbrockmendel
Copy link
Member

No description provided.

@@ -103,61 +106,102 @@ cdef class _NaT(datetime):
if ndim == -1:
return _nat_scalar_rules[op]

if util.is_array(other):
Copy link
Contributor

Choose a reason for hiding this comment

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

can you make these if/elif/else

Copy link
Member Author

Choose a reason for hiding this comment

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

sure

Copy link
Member Author

Choose a reason for hiding this comment

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

changed+green

# TODO: the integer behavior is deprecated, remove it
return c_NaT

elif util.is_array(other):
Copy link
Contributor

Choose a reason for hiding this comment

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

what if there is a 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.

this is specifically for ndarray, so there cant be a tz

@jreback jreback added the Missing-data np.nan, pd.NaT, pd.NA, dropna, isnull, interpolate label Aug 8, 2019
@jbrockmendel
Copy link
Member Author

@jreback gentle ping; a few open PRs are blockers for test consolidation etc

@jreback
Copy link
Contributor

jreback commented Aug 9, 2019

will try over weekend

@jreback jreback added this to the 1.0 milestone Aug 13, 2019
("datetime64[ns]", roperator.radd, "datetime64[ns]"),
("datetime64[ns]", operator.sub, "timedelta64[ns]"),
("datetime64[ns]", roperator.rsub, "timedelta64[ns]"),
("timedelta64[ns]", operator.add, "datetime64[ns]"),
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't these last for yield timedelta64[ns]?

Copy link
Member Author

Choose a reason for hiding this comment

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

No.

dt64, radd --> dt64 + Nat --> only valid if NaT is treated as td64 --> dt64
dt64, sub --> NaT - dt64 --> only valid if NaT is treated as dt64 --> td64
dt64, rsub --> dt64 - NaT --> valid either way, default to treat as dt64 --> td64
td64, add --> NaT + td64 --> valid either way, defalt to treat as dt64 --> dt64

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, yeah these rules are ok, but if you can put them down somewhere explicity in the code

@jreback jreback merged commit c1f7b39 into pandas-dev:master Aug 15, 2019
@jbrockmendel jbrockmendel deleted the natfix branch August 15, 2019 14:19
quintusdias pushed a commit to quintusdias/pandas_dev that referenced this pull request Aug 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Missing-data np.nan, pd.NaT, pd.NA, dropna, isnull, interpolate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants