@@ -224,12 +224,12 @@ def test_join_on(self):
224
224
self .assertTrue (np .isnan (joined ['three' ]['c' ]))
225
225
226
226
# merge column not p resent
227
- self .assertRaises (Exception , target .join , source , on = 'E' )
227
+ self .assertRaises (KeyError , target .join , source , on = 'E' )
228
228
229
229
# overlap
230
230
source_copy = source .copy ()
231
231
source_copy ['A' ] = 0
232
- self .assertRaises (Exception , target .join , source_copy , on = 'A' )
232
+ self .assertRaises (ValueError , target .join , source_copy , on = 'A' )
233
233
234
234
def test_join_on_fails_with_different_right_index (self ):
235
235
with tm .assertRaises (ValueError ):
@@ -551,15 +551,15 @@ def test_merge_index_singlekey_inner(self):
551
551
assert_frame_equal (result , expected .ix [:, result .columns ])
552
552
553
553
def test_merge_misspecified (self ):
554
- self .assertRaises (Exception , merge , self .left , self .right ,
554
+ self .assertRaises (ValueError , merge , self .left , self .right ,
555
555
left_index = True )
556
- self .assertRaises (Exception , merge , self .left , self .right ,
556
+ self .assertRaises (ValueError , merge , self .left , self .right ,
557
557
right_index = True )
558
558
559
- self .assertRaises (Exception , merge , self .left , self .left ,
559
+ self .assertRaises (ValueError , merge , self .left , self .left ,
560
560
left_on = 'key' , on = 'key' )
561
561
562
- self .assertRaises (Exception , merge , self .df , self .df2 ,
562
+ self .assertRaises (ValueError , merge , self .df , self .df2 ,
563
563
left_on = ['key1' ], right_on = ['key1' , 'key2' ])
564
564
565
565
def test_merge_overlap (self ):
@@ -854,7 +854,7 @@ def test_overlapping_columns_error_message(self):
854
854
df .columns = ['key' , 'foo' , 'foo' ]
855
855
df2 .columns = ['key' , 'bar' , 'bar' ]
856
856
857
- self .assertRaises (Exception , merge , df , df2 )
857
+ self .assertRaises (ValueError , merge , df , df2 )
858
858
859
859
def _check_merge (x , y ):
860
860
for how in ['inner' , 'left' , 'outer' ]:
@@ -2122,7 +2122,7 @@ def test_concat_exclude_none(self):
2122
2122
pieces = [df [:5 ], None , None , df [5 :]]
2123
2123
result = concat (pieces )
2124
2124
tm .assert_frame_equal (result , df )
2125
- self .assertRaises (Exception , concat , [None , None ])
2125
+ self .assertRaises (ValueError , concat , [None , None ])
2126
2126
2127
2127
def test_concat_datetime64_block (self ):
2128
2128
from pandas .tseries .index import date_range
0 commit comments