Skip to content

Commit 0057a90

Browse files
larsmanswesm
authored andcommitted
ENH better error message for mixed series/nonseries DataFrame construction
1 parent dfe7a55 commit 0057a90

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

pandas/core/frame.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -4842,7 +4842,10 @@ def extract_index(data):
48424842
'ambiguous ordering.')
48434843

48444844
if have_series:
4845-
assert(lengths[0] == len(index))
4845+
if lengths[0] != len(index):
4846+
msg = ('array length %d does not match index length %d'
4847+
% (lengths[0], len(index)))
4848+
raise ValueError(msg)
48464849
else:
48474850
index = Index(np.arange(lengths[0]))
48484851

pandas/tests/test_frame.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2173,7 +2173,7 @@ def test_constructor_mix_series_nonseries(self):
21732173
'B' : list(self.frame['B'])}, columns=['A', 'B'])
21742174
assert_frame_equal(df, self.frame.ix[:, ['A', 'B']])
21752175

2176-
self.assertRaises(Exception, DataFrame,
2176+
self.assertRaises(ValueError, DataFrame,
21772177
{'A' : self.frame['A'],
21782178
'B' : list(self.frame['B'])[:-2]})
21792179

0 commit comments

Comments
 (0)