@@ -2000,7 +2000,7 @@ def _ixs(self, i, axis=0):
2000
2000
label = self .index [i ]
2001
2001
if isinstance (label , Index ):
2002
2002
# a location index by definition
2003
- result = self .take (i , axis = axis )
2003
+ result = self ._take (i , axis = axis )
2004
2004
copy = True
2005
2005
else :
2006
2006
new_values = self ._data .fast_xs (i )
@@ -2032,7 +2032,7 @@ def _ixs(self, i, axis=0):
2032
2032
return self .loc [:, lab_slice ]
2033
2033
else :
2034
2034
if isinstance (label , Index ):
2035
- return self .take (i , axis = 1 )
2035
+ return self ._take (i , axis = 1 , convert = True )
2036
2036
2037
2037
index_len = len (self .index )
2038
2038
@@ -2114,10 +2114,10 @@ def _getitem_array(self, key):
2114
2114
# be reindexed to match DataFrame rows
2115
2115
key = check_bool_indexer (self .index , key )
2116
2116
indexer = key .nonzero ()[0 ]
2117
- return self .take (indexer , axis = 0 )
2117
+ return self ._take (indexer , axis = 0 , convert = False )
2118
2118
else :
2119
2119
indexer = self .loc ._convert_to_indexer (key , axis = 1 )
2120
- return self .take (indexer , axis = 1 )
2120
+ return self ._take (indexer , axis = 1 , convert = True )
2121
2121
2122
2122
def _getitem_multilevel (self , key ):
2123
2123
loc = self .columns .get_loc (key )
@@ -3333,7 +3333,7 @@ def dropna(self, axis=0, how='any', thresh=None, subset=None,
3333
3333
check = indices == - 1
3334
3334
if check .any ():
3335
3335
raise KeyError (list (np .compress (check , subset )))
3336
- agg_obj = self .take (indices , axis = agg_axis )
3336
+ agg_obj = self ._take (indices , axis = agg_axis )
3337
3337
3338
3338
count = agg_obj .count (axis = agg_axis )
3339
3339
@@ -3349,7 +3349,7 @@ def dropna(self, axis=0, how='any', thresh=None, subset=None,
3349
3349
else :
3350
3350
raise TypeError ('must specify how or thresh' )
3351
3351
3352
- result = self .take (mask .nonzero ()[0 ], axis = axis )
3352
+ result = self ._take (mask .nonzero ()[0 ], axis = axis , convert = False )
3353
3353
3354
3354
if inplace :
3355
3355
self ._update_inplace (result )
@@ -3483,9 +3483,9 @@ def trans(v):
3483
3483
indexer = nargsort (k , kind = kind , ascending = ascending ,
3484
3484
na_position = na_position )
3485
3485
3486
- new_data = self ._data .take (indexer ,
3487
- axis = self ._get_block_manager_axis (axis ),
3488
- verify = False )
3486
+ new_data = self ._data ._take (indexer ,
3487
+ axis = self ._get_block_manager_axis (axis ),
3488
+ convert = False , verify = False )
3489
3489
3490
3490
if inplace :
3491
3491
return self ._update_inplace (new_data )
@@ -3544,9 +3544,9 @@ def sort_index(self, axis=0, level=None, ascending=True, inplace=False,
3544
3544
na_position = na_position )
3545
3545
3546
3546
baxis = self ._get_block_manager_axis (axis )
3547
- new_data = self ._data .take (indexer ,
3548
- axis = baxis ,
3549
- verify = False )
3547
+ new_data = self ._data ._take (indexer ,
3548
+ axis = baxis ,
3549
+ convert = False , verify = False )
3550
3550
3551
3551
# reconstruct axis if needed
3552
3552
new_data .axes [baxis ] = new_data .axes [baxis ]._sort_levels_monotonic ()
0 commit comments