Skip to content

Commit 19dc284

Browse files
committed
BUG: fix concatenate bug causing #2057, but obscured by omitted asserts. close #2057
1 parent 1320156 commit 19dc284

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

pandas/core/common.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -885,8 +885,7 @@ def is_list_like(arg):
885885
def _is_sequence(x):
886886
try:
887887
iter(x)
888-
assert(not isinstance(x, basestring))
889-
return True
888+
return not isinstance(x, basestring) and True
890889
except Exception:
891890
return False
892891

pandas/core/internals.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@ def __init__(self, values, items, ref_items, ndim=2):
2323
if issubclass(values.dtype.type, basestring):
2424
values = np.array(values, dtype=object)
2525

26-
assert(values.ndim == ndim)
27-
assert(len(items) == len(values))
26+
if values.ndim != ndim:
27+
raise AssertionError('Wrong number of dimensions')
28+
29+
if len(items) != len(values):
30+
raise AssertionError('Wrong number of items passed')
2831

2932
self._ref_locs = None
3033
self.values = values

pandas/tools/merge.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ def _get_reindexed_data(self):
10251025

10261026
def _concat_blocks(self, blocks):
10271027
values_list = [b.values for b in blocks if b is not None]
1028-
concat_values = com._concat_compat(values_list)
1028+
concat_values = com._concat_compat(values_list, axis=self.axis)
10291029

10301030
if self.axis > 0:
10311031
# Not safe to remove this check, need to profile

0 commit comments

Comments
 (0)