Skip to content
Prev Previous commit
Next Next commit
Revert base.py
  • Loading branch information
hexgnu committed Feb 5, 2018
commit ae9f74d588fd34db80feacd21b630eba0599617b
14 changes: 4 additions & 10 deletions pandas/core/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1069,18 +1069,12 @@ def memory_usage(self, deep=False):
--------
numpy.ndarray.nbytes
"""
# Use sparse values if they exist for memory consumption
# if hasattr(self.values, 'sp_values'):
# values = self.values.sp_values
# else:
values = self.values
if hasattr(self.values, 'memory_usage'):
return self.values.memory_usage(deep=deep)

if hasattr(values, 'memory_usage'):
return values.memory_usage(deep=deep)

v = values.nbytes
v = self.values.nbytes
if deep and is_object_dtype(self) and not PYPY:
v += lib.memory_usage_of_objects(values)
v += lib.memory_usage_of_objects(self.values)
return v

def factorize(self, sort=False, na_sentinel=-1):
Expand Down