Tst verify return none in tests/frame (#35232) · pandas-dev/pandas@9827ce0 (original) (raw)

`@@ -162,7 +162,8 @@ def _check_set(df, cond, check_dtypes=True):

`

162

162

`econd = cond.reindex_like(df).fillna(True)

`

163

163

`expected = dfi.mask(~econd)

`

164

164

``

165

``

`-

dfi.where(cond, np.nan, inplace=True)

`

``

165

`+

return_value = dfi.where(cond, np.nan, inplace=True)

`

``

166

`+

assert return_value is None

`

166

167

`tm.assert_frame_equal(dfi, expected)

`

167

168

``

168

169

`# dtypes (and confirm upcasts)x

`

`@@ -303,7 +304,8 @@ def test_where_bug(self):

`

303

304

`tm.assert_frame_equal(result, expected)

`

304

305

``

305

306

`result = df.copy()

`

306

``

`-

result.where(result > 2, np.nan, inplace=True)

`

``

307

`+

return_value = result.where(result > 2, np.nan, inplace=True)

`

``

308

`+

assert return_value is None

`

307

309

`tm.assert_frame_equal(result, expected)

`

308

310

``

309

311

`def test_where_bug_mixed(self, sint_dtype):

`

`@@ -324,7 +326,8 @@ def test_where_bug_mixed(self, sint_dtype):

`

324

326

`tm.assert_frame_equal(result, expected)

`

325

327

``

326

328

`result = df.copy()

`

327

``

`-

result.where(result > 2, np.nan, inplace=True)

`

``

329

`+

return_value = result.where(result > 2, np.nan, inplace=True)

`

``

330

`+

assert return_value is None

`

328

331

`tm.assert_frame_equal(result, expected)

`

329

332

``

330

333

`def test_where_bug_transposition(self):

`

`@@ -417,7 +420,8 @@ def create():

`

417

420

`result = df.where(pd.notna(df), df.mean(), axis="columns")

`

418

421

`tm.assert_frame_equal(result, expected)

`

419

422

``

420

``

`-

df.where(pd.notna(df), df.mean(), inplace=True, axis="columns")

`

``

423

`+

return_value = df.where(pd.notna(df), df.mean(), inplace=True, axis="columns")

`

``

424

`+

assert return_value is None

`

421

425

`tm.assert_frame_equal(df, expected)

`

422

426

``

423

427

`df = create().fillna(0)

`

`@@ -453,15 +457,17 @@ def test_where_axis(self):

`

453

457

`tm.assert_frame_equal(result, expected)

`

454

458

``

455

459

`result = df.copy()

`

456

``

`-

result.where(mask, s, axis="index", inplace=True)

`

``

460

`+

return_value = result.where(mask, s, axis="index", inplace=True)

`

``

461

`+

assert return_value is None

`

457

462

`tm.assert_frame_equal(result, expected)

`

458

463

``

459

464

`expected = DataFrame([[0, 1], [0, 1]], dtype="float64")

`

460

465

`result = df.where(mask, s, axis="columns")

`

461

466

`tm.assert_frame_equal(result, expected)

`

462

467

``

463

468

`result = df.copy()

`

464

``

`-

result.where(mask, s, axis="columns", inplace=True)

`

``

469

`+

return_value = result.where(mask, s, axis="columns", inplace=True)

`

``

470

`+

assert return_value is None

`

465

471

`tm.assert_frame_equal(result, expected)

`

466

472

``

467

473

`# Upcast needed

`

`@@ -474,7 +480,8 @@ def test_where_axis(self):

`

474

480

`tm.assert_frame_equal(result, expected)

`

475

481

``

476

482

`result = df.copy()

`

477

``

`-

result.where(mask, s, axis="index", inplace=True)

`

``

483

`+

return_value = result.where(mask, s, axis="index", inplace=True)

`

``

484

`+

assert return_value is None

`

478

485

`tm.assert_frame_equal(result, expected)

`

479

486

``

480

487

`expected = DataFrame([[0, np.nan], [0, np.nan]])

`

`@@ -488,7 +495,8 @@ def test_where_axis(self):

`

488

495

` }

`

489

496

` )

`

490

497

`result = df.copy()

`

491

``

`-

result.where(mask, s, axis="columns", inplace=True)

`

``

498

`+

return_value = result.where(mask, s, axis="columns", inplace=True)

`

``

499

`+

assert return_value is None

`

492

500

`tm.assert_frame_equal(result, expected)

`

493

501

``

494

502

`# Multiple dtypes (=> multiple Blocks)

`

`@@ -511,7 +519,8 @@ def test_where_axis(self):

`

511

519

`tm.assert_frame_equal(result, expected)

`

512

520

``

513

521

`result = df.copy()

`

514

``

`-

result.where(mask, s1, axis="columns", inplace=True)

`

``

522

`+

return_value = result.where(mask, s1, axis="columns", inplace=True)

`

``

523

`+

assert return_value is None

`

515

524

`tm.assert_frame_equal(result, expected)

`

516

525

``

517

526

`result = df.where(mask, s2, axis="index")

`

`@@ -521,7 +530,8 @@ def test_where_axis(self):

`

521

530

`tm.assert_frame_equal(result, expected)

`

522

531

``

523

532

`result = df.copy()

`

524

``

`-

result.where(mask, s2, axis="index", inplace=True)

`

``

533

`+

return_value = result.where(mask, s2, axis="index", inplace=True)

`

``

534

`+

assert return_value is None

`

525

535

`tm.assert_frame_equal(result, expected)

`

526

536

``

527

537

`# DataFrame vs DataFrame

`

`@@ -534,10 +544,12 @@ def test_where_axis(self):

`

534

544

`result = df.where(mask, d1, axis="index")

`

535

545

`tm.assert_frame_equal(result, expected)

`

536

546

`result = df.copy()

`

537

``

`-

result.where(mask, d1, inplace=True)

`

``

547

`+

return_value = result.where(mask, d1, inplace=True)

`

``

548

`+

assert return_value is None

`

538

549

`tm.assert_frame_equal(result, expected)

`

539

550

`result = df.copy()

`

540

``

`-

result.where(mask, d1, inplace=True, axis="index")

`

``

551

`+

return_value = result.where(mask, d1, inplace=True, axis="index")

`

``

552

`+

assert return_value is None

`

541

553

`tm.assert_frame_equal(result, expected)

`

542

554

``

543

555

`d2 = df.copy().drop(1, axis=1)

`

`@@ -549,10 +561,12 @@ def test_where_axis(self):

`

549

561

`result = df.where(mask, d2, axis="columns")

`

550

562

`tm.assert_frame_equal(result, expected)

`

551

563

`result = df.copy()

`

552

``

`-

result.where(mask, d2, inplace=True)

`

``

564

`+

return_value = result.where(mask, d2, inplace=True)

`

``

565

`+

assert return_value is None

`

553

566

`tm.assert_frame_equal(result, expected)

`

554

567

`result = df.copy()

`

555

``

`-

result.where(mask, d2, inplace=True, axis="columns")

`

``

568

`+

return_value = result.where(mask, d2, inplace=True, axis="columns")

`

``

569

`+

assert return_value is None

`

556

570

`tm.assert_frame_equal(result, expected)

`

557

571

``

558

572

`def test_where_callable(self):

`