6
6
7
7
import numpy as np
8
8
9
- from pandas import DataFrame , Index , MultiIndex , Series
9
+ from pandas .core .dtypes .generic import ABCSeries
10
+
11
+ from pandas import DataFrame , Index , MultiIndex
10
12
from pandas .core import common as com
11
13
from pandas .core .arrays .categorical import (
12
14
_factorize_from_iterable ,
@@ -322,7 +324,7 @@ def __init__(
322
324
# consolidate data & figure out what our result ndim is going to be
323
325
ndims = set ()
324
326
for obj in objs :
325
- if not isinstance (obj , (Series , DataFrame )):
327
+ if not isinstance (obj , (ABCSeries , DataFrame )):
326
328
msg = (
327
329
"cannot concatenate object of type '{}';"
328
330
" only Series and DataFrame objs are valid" .format (type (obj ))
@@ -348,7 +350,7 @@ def __init__(
348
350
# filter out the empties if we have not multi-index possibilities
349
351
# note to keep empty Series as it affect to result columns / name
350
352
non_empties = [
351
- obj for obj in objs if sum (obj .shape ) > 0 or isinstance (obj , Series )
353
+ obj for obj in objs if sum (obj .shape ) > 0 or isinstance (obj , ABCSeries )
352
354
]
353
355
354
356
if len (non_empties ) and (
@@ -362,7 +364,7 @@ def __init__(
362
364
self .objs = objs
363
365
364
366
# Standardize axis parameter to int
365
- if isinstance (sample , Series ):
367
+ if isinstance (sample , ABCSeries ):
366
368
axis = DataFrame ._get_axis_number (axis )
367
369
else :
368
370
axis = sample ._get_axis_number (axis )
@@ -372,7 +374,7 @@ def __init__(
372
374
if self ._is_frame :
373
375
axis = 1 if axis == 0 else 0
374
376
375
- self ._is_series = isinstance (sample , Series )
377
+ self ._is_series = isinstance (sample , ABCSeries )
376
378
if not 0 <= axis <= sample .ndim :
377
379
raise AssertionError (
378
380
"axis must be between 0 and {ndim}, input was"
@@ -545,7 +547,7 @@ def _get_concat_axis(self):
545
547
num = 0
546
548
has_names = False
547
549
for i , x in enumerate (self .objs ):
548
- if not isinstance (x , Series ):
550
+ if not isinstance (x , ABCSeries ):
549
551
raise TypeError (
550
552
"Cannot concatenate type 'Series' "
551
553
"with object of type {type!r}" .format (type = type (x ).__name__ )
0 commit comments