@@ -433,11 +433,11 @@ def quantile(self, axis=0, consolidate=True, transposed=False,
433
433
self ._consolidate_inplace ()
434
434
435
435
def get_axe (block , qs , axes ):
436
+ # Because Series dispatches to DataFrame, we will always have
437
+ # block.ndim == 2
436
438
from pandas import Float64Index
437
439
if is_list_like (qs ):
438
440
ax = Float64Index (qs )
439
- elif block .ndim == 1 :
440
- ax = Float64Index ([qs ])
441
441
else :
442
442
ax = axes [0 ]
443
443
return ax
@@ -1345,27 +1345,6 @@ def take(self, indexer, axis=1, verify=True, convert=True):
1345
1345
return self .reindex_indexer (new_axis = new_labels , indexer = indexer ,
1346
1346
axis = axis , allow_dups = True )
1347
1347
1348
- def merge (self , other , lsuffix = '' , rsuffix = '' ):
1349
- # We assume at this point that the axes of self and other match.
1350
- # This is only called from Panel.join, which reindexes prior
1351
- # to calling to ensure this assumption holds.
1352
- l , r = items_overlap_with_suffix (left = self .items , lsuffix = lsuffix ,
1353
- right = other .items , rsuffix = rsuffix )
1354
- new_items = _concat_indexes ([l , r ])
1355
-
1356
- new_blocks = [blk .copy (deep = False ) for blk in self .blocks ]
1357
-
1358
- offset = self .shape [0 ]
1359
- for blk in other .blocks :
1360
- blk = blk .copy (deep = False )
1361
- blk .mgr_locs = blk .mgr_locs .add (offset )
1362
- new_blocks .append (blk )
1363
-
1364
- new_axes = list (self .axes )
1365
- new_axes [0 ] = new_items
1366
-
1367
- return self .__class__ (_consolidate (new_blocks ), new_axes )
1368
-
1369
1348
def equals (self , other ):
1370
1349
self_axes , other_axes = self .axes , other .axes
1371
1350
if len (self_axes ) != len (other_axes ):
@@ -1553,14 +1532,6 @@ def get_values(self):
1553
1532
""" return a dense type view """
1554
1533
return np .array (self ._block .to_dense (), copy = False )
1555
1534
1556
- @property
1557
- def asobject (self ):
1558
- """
1559
- return a object dtype array. datetime/timedelta like values are boxed
1560
- to Timestamp/Timedelta instances.
1561
- """
1562
- return self ._block .get_values (dtype = object )
1563
-
1564
1535
@property
1565
1536
def _can_hold_na (self ):
1566
1537
return self ._block ._can_hold_na
@@ -1949,10 +1920,7 @@ def _compare_or_regex_search(a, b, regex=False):
1949
1920
return result
1950
1921
1951
1922
1952
- def _concat_indexes (indexes ):
1953
- return indexes [0 ].append (indexes [1 :])
1954
-
1955
-
1923
+ # TODO: this is no longer used in this module, could be moved to concat
1956
1924
def items_overlap_with_suffix (left , lsuffix , right , rsuffix ):
1957
1925
"""
1958
1926
If two indices overlap, add suffixes to overlapping entries.
0 commit comments