Skip to content

TYP: remove NaTType as possible result of Timestamp and Timedelta constructor #46171

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 20 commits into from
Mar 8, 2022
Merged

TYP: remove NaTType as possible result of Timestamp and Timedelta constructor #46171

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9e57d6d
fix column_arrays for array manager
Dr-Irv Dec 21, 2021
2abbc57
merge with upstream/main
Dr-Irv Jan 15, 2022
99158b1
Merge remote-tracking branch 'upstream/main'
Dr-Irv Jan 24, 2022
0f4130d
Merge remote-tracking branch 'upstream/main'
Dr-Irv Feb 4, 2022
24ecfe2
Merge remote-tracking branch 'upstream/main'
Dr-Irv Feb 8, 2022
64f00d5
Merge remote-tracking branch 'upstream/main'
Dr-Irv Feb 9, 2022
1ee6e00
Merge remote-tracking branch 'upstream/main'
Dr-Irv Feb 19, 2022
5761bf2
Merge remote-tracking branch 'upstream/main'
Dr-Irv Feb 23, 2022
84b119f
remove dead code in arrays/interval.py
Dr-Irv Feb 23, 2022
5232375
Merge remote-tracking branch 'upstream/main'
Dr-Irv Feb 25, 2022
64feddd
Undo Revert "remove dead code in arrays/interval.py"
Dr-Irv Feb 25, 2022
1cc352a
Merge remote-tracking branch 'upstream/main'
Dr-Irv Feb 27, 2022
39b3b98
remove NaTType as possible result of Timestamp and Timedelta constructor
Dr-Irv Feb 27, 2022
031397c
add comments with ref to PR for reasoning
Dr-Irv Mar 2, 2022
773e808
don't make NaTType a subclass of datetime
Dr-Irv Mar 3, 2022
9d22a77
merge in main that now has offsets
Dr-Irv Mar 3, 2022
5a7b312
put back code in core/arrays/datetimes.py
Dr-Irv Mar 3, 2022
5abe369
Merge remote-tracking branch 'upstream/main' into nonattype
Dr-Irv Mar 6, 2022
d980ebe
Merge remote-tracking branch 'upstream/main' into nonattype
Dr-Irv Mar 7, 2022
e79d253
Add DatetimeNaTType type
Dr-Irv Mar 7, 2022
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
6 changes: 2 additions & 4 deletions pandas/_libs/tslibs/timedeltas.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@ class Timedelta(timedelta):
max: ClassVar[Timedelta]
resolution: ClassVar[Timedelta]
value: int # np.int64

# error: "__new__" must return a class instance (got "Union[Timedelta, NaTType]")
def __new__( # type: ignore[misc]
def __new__(
cls: Type[_S],
value=...,
unit: str = ...,
**kwargs: int | float | np.integer | np.floating,
) -> _S | NaTType: ...
) -> _S: ...
@property
def days(self) -> int: ...
@property
Expand Down
6 changes: 2 additions & 4 deletions pandas/_libs/tslibs/timestamps.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ class Timestamp(datetime):

resolution: ClassVar[Timedelta]
value: int # np.int64

# error: "__new__" must return a class instance (got "Union[Timestamp, NaTType]")
def __new__( # type: ignore[misc]
def __new__(
cls: type[_DatetimeT],
ts_input: int
| np.integer
Expand All @@ -56,7 +54,7 @@ class Timestamp(datetime):
tzinfo: _tzinfo | None = ...,
*,
fold: int | None = ...,
) -> _DatetimeT | NaTType: ...
) -> _DatetimeT: ...
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 add a comment (maybe ref this issue) about the reasoning here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done in next commit

def _set_freq(self, freq: BaseOffset | None) -> None: ...
@property
def year(self) -> int: ...
Expand Down