replaced isna with isnull because old pandas complained...

nomorestory · Dec 5, 2018 · 0a84d36 · 0a84d36
1 parent 795e824
commit 0a84d36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pandapower/io_utils.py b/pandapower/io_utils.py
@@ -52,7 +52,7 @@ def coords_to_df(value, geotype="line"):
             for nr, (x, y) in enumerate(coords):
                 geo.loc[i, "x%u" % nr] = x
                 geo.loc[i, "y%u" % nr] = y
-        elif pd.isna(coords):
+        elif pd.isnull(coords):
             continue
         else:
             logger.error("unkown format for coords for value {}".format(value))
@@ -271,7 +271,7 @@ def pp_hook(d):
             # coords column is not handled properly when using from_features
             if 'coords' in df:
                 # df['coords'] = df.coords.apply(json.loads)
-                valid_coords = ~pd.isna(df.coords)
+                valid_coords = ~pd.isnull(df.coords)
                 df.loc[valid_coords, 'coords'] = df.loc[valid_coords, "coords"].apply(json.loads)
             df = df.reindex(columns=d['columns'])
             return df

diff --git a/pandapower/plotting/collections.py b/pandapower/plotting/collections.py
@@ -13,7 +13,7 @@
 from matplotlib.patches import Circle, Ellipse, Rectangle, RegularPolygon, Arc, PathPatch
 from matplotlib.textpath import TextPath
 from matplotlib.transforms import Affine2D
-from pandas import isna
+from pandas import isnull
 
 try:
     import pplog as logging
@@ -528,7 +528,7 @@ def create_busbar_collection(net, buses=None, infofunc=None, cmap=None, norm=Non
     """
 
     if buses is None:
-        buses = net.bus_geodata.loc[~isna(net.bus_geodata.coords)].index
+        buses = net.bus_geodata.loc[~isnull(net.bus_geodata.coords)].index
 
     if cmap is not None:
         # determine color of busbar by vm_pu