BUG: fillna maximum recursion depth exceeded in cmp (GH18159).

reef-technologies · Nov 10, 2017 · 395d614 · 395d614
1 parent 9050e38
commit 395d614
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pandas/core/internals.py b/pandas/core/internals.py
@@ -1837,8 +1837,9 @@ def _can_hold_element(self, element):
         if tipo is not None:
             return (issubclass(tipo.type, (np.floating, np.integer)) and
                     not issubclass(tipo.type, (np.datetime64, np.timedelta64)))
-        return (isinstance(element, (float, int, np.floating, np.int_)) and
-                not isinstance(element, (bool, np.bool_, datetime, timedelta,
+        return (
+            isinstance(element, (float, int, np.floating, np.int_, np.long))
+            and not isinstance(element, (bool, np.bool_, datetime, timedelta,
                                          np.datetime64, np.timedelta64)))
 
     def to_native_types(self, slicer=None, na_rep='', float_format=None,