From 04b7306f92b6f7e1a9ae63dc87ae986542cb0575 Mon Sep 17 00:00:00 2001 From: Carlos Souza Date: Thu, 23 Mar 2017 22:21:19 -0300 Subject: [PATCH] Removing .values and formating code PEP8 --- pandas/core/generic.py | 2 +- pandas/tests/frame/test_asof.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index d1148f8822e6a..308c180ce665a 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -3972,7 +3972,7 @@ def asof(self, where, subset=None): where = Index(where) if is_list else Index([where]) nulls = self.isnull() if is_series else self[subset].isnull().any(1) - if nulls.values.all(): + if nulls.all(): if is_series: return pd.Series(np.nan, index=where) else: diff --git a/pandas/tests/frame/test_asof.py b/pandas/tests/frame/test_asof.py index 0ba1b0836faf6..d2b47093fa5df 100644 --- a/pandas/tests/frame/test_asof.py +++ b/pandas/tests/frame/test_asof.py @@ -10,7 +10,6 @@ class TestFrameAsof(TestData, tm.TestCase): - def setUp(self): self.N = N = 50 self.rng = date_range('1/1/1990', periods=N, freq='53s') @@ -18,7 +17,6 @@ def setUp(self): index=self.rng) def test_basic(self): - df = self.df.copy() df.loc[15:30, 'A'] = np.nan dates = date_range('1/1/1990', periods=self.N * 3, @@ -38,7 +36,6 @@ def test_basic(self): self.assertTrue((rs == 14).all(1).all()) def test_subset(self): - N = 10 rng = date_range('1/1/1990', periods=N, freq='53s') df = DataFrame({'A': np.arange(N), 'B': np.arange(N)}, @@ -96,7 +93,8 @@ def test_all_nans(self): # testing multiple columns dates = date_range('1/1/1990', periods=self.N * 3, freq='25s') - result = DataFrame(np.nan, index=self.rng, columns=['A', 'B', 'C']).asof(dates) + result = DataFrame(np.nan, index=self.rng, + columns=['A', 'B', 'C']).asof(dates) expected = DataFrame(np.nan, index=dates, columns=['A', 'B', 'C']) tm.assert_frame_equal(result, expected)