First simplification, code-block in the same place

mattip · Mar 25, 2017 · 0765108 · 0765108
1 parent bb63964
commit 0765108
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/pandas/core/generic.py b/pandas/core/generic.py
@@ -3975,12 +3975,10 @@ def asof(self, where, subset=None):
         if nulls.all():
             if is_series:
                 return pd.Series(np.nan, index=where, name=self.name)
+            elif is_list:
+                return pd.DataFrame(np.nan, index=where, columns=self.columns)
             else:
-                if is_list:
-                    return pd.DataFrame(np.nan, index=where,
-                                        columns=self.columns)
-                else:
-                    return pd.Series(np.nan, index=self.columns, name=where[0])
+                return pd.Series(np.nan, index=self.columns, name=where[0])
 
         locs = self.index.asof_locs(where, ~(nulls.values))