neurons.has_...: fix issue with empty data

navis-org · Jan 10, 2021 · a7f98cc · a7f98cc
1 parent ab4490d
commit a7f98cc
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/navis/core/neurons.py b/navis/core/neurons.py
@@ -151,14 +151,19 @@ def __getattr__(self, key):
             key = key[key.index('_') + 1:]
             if hasattr(self, key):
                 data = getattr(self, key)
-                if isinstance(data, pd.DataFrame) and not data.empty:
-                    return True
+                if isinstance(data, pd.DataFrame):
+                    if not data.empty:
+                        return True
+                    else:
+                        return False
                 # This is necessary because np.any does not like strings
                 elif isinstance(data, str):
                     if data == 'NA' or not data:
                         return False
                     return True
-                elif np.any(data):
+                elif utils.is_iterable(data) and len(data) > 0:
+                    return True
+                elif data:
                     return True
             return False
         elif key.startswith('n_'):