File tree 2 files changed +8
-3
lines changed
2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -4575,7 +4575,7 @@ def extract_index(data):
4575
4575
4576
4576
4577
4577
def _prep_ndarray (values , copy = True ):
4578
- if not isinstance (values , np .ndarray ):
4578
+ if not isinstance (values , ( np .ndarray , Series ) ):
4579
4579
if len (values ) == 0 :
4580
4580
return np .empty ((0 , 0 ), dtype = object )
4581
4581
Original file line number Diff line number Diff line change 25
25
frame_ctor_nested_dict = Benchmark ("DataFrame(data)" , setup )
26
26
27
27
# From JSON-like stuff
28
-
29
28
frame_ctor_list_of_dict = Benchmark ("DataFrame(dict_list)" , setup ,
30
29
start_date = datetime (2011 , 12 , 20 ))
31
30
32
31
series_ctor_from_dict = Benchmark ("Series(some_dict)" , setup )
33
32
34
33
# nested dict, integer indexes, regression described in #621
35
-
36
34
setup = common_setup + """
37
35
data = dict((i,dict((j,float(j)) for j in xrange(100))) for i in xrange(2000))
38
36
"""
39
37
frame_ctor_nested_dict_int64 = Benchmark ("DataFrame(data)" , setup )
40
38
39
+ # from a mi-series
40
+ setup = common_setup + """
41
+ mi = MultiIndex.from_tuples([(x,y) for x in range(100) for y in range(100)])
42
+ s = Series(randn(10000), index=mi)
43
+ """
44
+ frame_from_series = Benchmark ("DataFrame(s)" , setup )
45
+
41
46
#----------------------------------------------------------------------
42
47
# get_numeric_data
43
48
You can’t perform that action at this time.
0 commit comments