Skip to content

Commit ae9f74d

Browse files
committed
Revert base.py
1 parent cdd4141 commit ae9f74d

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

pandas/core/base.py

+4-10
Original file line numberDiff line numberDiff line change
@@ -1069,18 +1069,12 @@ def memory_usage(self, deep=False):
10691069
--------
10701070
numpy.ndarray.nbytes
10711071
"""
1072-
# Use sparse values if they exist for memory consumption
1073-
# if hasattr(self.values, 'sp_values'):
1074-
# values = self.values.sp_values
1075-
# else:
1076-
values = self.values
1072+
if hasattr(self.values, 'memory_usage'):
1073+
return self.values.memory_usage(deep=deep)
10771074

1078-
if hasattr(values, 'memory_usage'):
1079-
return values.memory_usage(deep=deep)
1080-
1081-
v = values.nbytes
1075+
v = self.values.nbytes
10821076
if deep and is_object_dtype(self) and not PYPY:
1083-
v += lib.memory_usage_of_objects(values)
1077+
v += lib.memory_usage_of_objects(self.values)
10841078
return v
10851079

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

0 commit comments

Comments
 (0)