Skip to content

Commit bdabec4

Browse files
committed
Merge pull request #3245 from jreback/GH3243
BUG: GH3243 accept list of DataFrames as constructor input
2 parents b846abf + fb09e60 commit bdabec4

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

pandas/core/common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ def _possibly_convert_platform(values):
10281028

10291029
if isinstance(values, (list,tuple)):
10301030
values = lib.list_to_object_array(values)
1031-
if values.dtype == np.object_:
1031+
if getattr(values,'dtype',None) == np.object_:
10321032
values = lib.maybe_convert_objects(values)
10331033

10341034
return values

pandas/tests/test_frame.py

+9
Original file line numberDiff line numberDiff line change
@@ -2040,6 +2040,15 @@ def test_constructor_dtype_list_data(self):
20402040
self.assert_(df.ix[1, 0] is None)
20412041
self.assert_(df.ix[0, 1] == '2')
20422042

2043+
def test_constructor_list_frames(self):
2044+
2045+
# GH 3243
2046+
result = DataFrame([DataFrame([])])
2047+
self.assert_(result.shape == (1,0))
2048+
2049+
result = DataFrame([DataFrame(dict(A = range(5)))])
2050+
self.assert_(type(result.iloc[0,0]) == DataFrame)
2051+
20432052
def test_constructor_mixed_dtypes(self):
20442053

20452054
def _make_mixed_dtypes_df(typ, ad = None):

0 commit comments

Comments
 (0)