Skip to content

BUG: Fixing DataFrame.Update crashes when NaT present #49395

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
MarcoGorelli merged 11 commits into from
Nov 15, 2022
Merged

BUG: Fixing DataFrame.Update crashes when NaT present #49395

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2d126dd
Fixes DataFrame.update crashes when NaT present. GH16713
wxing11 Oct 30, 2022
b4c792a
Formatting
wxing11 Oct 30, 2022
c63d1cc
No longer reindexing columns, skipping non-matching columns
wxing11 Nov 3, 2022
7bea232
switching to using set intersection to find shared columns
wxing11 Nov 3, 2022
9ee4329
switching to using index intersection
wxing11 Nov 3, 2022
f191629
Removing unnecessary variable creation
wxing11 Nov 8, 2022
35fa0a8
Formatting and removing test
wxing11 Nov 8, 2022
ead244a
Adding to whatsnew
wxing11 Nov 8, 2022
bd07c5a
updating whatsnew message
wxing11 Nov 12, 2022
8a1e0f7
Merge branch 'main' into fixing-dataframe-update-crashes
MarcoGorelli Nov 14, 2022
d8167ea
Update doc/source/whatsnew/v2.0.0.rst
MarcoGorelli Nov 15, 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
Prev Previous commit
Next Next commit
No longer reindexing columns, skipping non-matching columns
  • Loading branch information
@wxing11
wxing11 committed Nov 3, 2022
commit c63d1cc55d9984e16f73e8db94c4ddbbda8b3721
9 changes: 5 additions & 4 deletions pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8190,15 +8190,16 @@ def update(
if not isinstance(other, DataFrame):
other = DataFrame(other)

other = other.reindex_like(self)
# reindex rows, non-matching columns get skipped
Copy link
Member

@MarcoGorelli MarcoGorelli Nov 8, 2022

Choose a reason for hiding this comment

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

not sure we need this comment

other = other.reindex(self.index)

for col in self.columns:
if col not in other.columns:
continue

this = self[col]._values
that = other[col]._values

if all(isna(that)):
continue

if filter_func is not None:
with np.errstate(all="ignore"):
mask = ~filter_func(this) | isna(that)
Expand Down