@@ -1550,11 +1550,22 @@ def test_setitem_single_column_mixed_datetime(self):
1550
1550
1551
1551
def test_setitem_mixed_datetime (self ):
1552
1552
# GH 9336
1553
- expected = DataFrame ({'date' : [1 , 'a' , 'b' ]})
1554
- df = DataFrame ({'date' : Series (pd .NaT , range (3 ))})
1555
- df .loc [0 , 'date' ] = 1
1556
- df .loc [1 :2 , 'date' ] = 'a' , 'b'
1557
- tm .assert_frame_equal (df , expected )
1553
+ expected = DataFrame ({'a' : [0 , 0 , 0 , 0 , 13 , 14 ],
1554
+ 'b' : [pd .datetime (2012 , 1 , 1 ),
1555
+ 1 ,
1556
+ 'x' ,
1557
+ 'y' ,
1558
+ pd .datetime (2013 , 1 , 1 ),
1559
+ pd .datetime (2014 , 1 , 1 )]})
1560
+ df = pd .DataFrame (np .zeros ((6 , 2 ), dtype = int ), columns = ['a' , 'b' ])
1561
+ df ['b' ] = pd .NaT
1562
+ df .loc [0 , 'b' ] = pd .datetime (2012 , 1 , 1 )
1563
+ df .loc [1 , 'b' ] = 1
1564
+ df .loc [[2 , 3 ], 'b' ] = 'x' , 'y'
1565
+ A = pd .DataFrame ([[13 , pd .datetime (2013 , 1 , 1 )],
1566
+ [14 , pd .datetime (2014 , 1 , 1 )]])
1567
+ df .loc [[4 , 5 ], ['a' , 'b' ]] = A .values
1568
+ assert_frame_equal (df , expected )
1558
1569
1559
1570
def test_setitem_frame (self ):
1560
1571
piece = self .frame .loc [self .frame .index [:2 ], ['A' , 'B' ]]
0 commit comments