@@ -201,8 +201,8 @@ def test_merge_misspecified(self):
201
201
merge (self .left , self .right , right_index = True )
202
202
203
203
msg = (
204
- 'Can only pass argument "on" OR "left_on" and "right_on", not'
205
- " a combination of both"
204
+ 'Can only pass argument "on" OR "left_on" and "right_on", not '
205
+ "a combination of both"
206
206
)
207
207
with pytest .raises (pd .errors .MergeError , match = msg ):
208
208
merge (self .left , self .left , left_on = "key" , on = "key" )
@@ -1013,10 +1013,9 @@ def test_indicator(self):
1013
1013
df_badcolumn = DataFrame ({"col1" : [1 , 2 ], i : [2 , 2 ]})
1014
1014
1015
1015
msg = (
1016
- "Cannot use `indicator=True` option when data contains a"
1017
- " column named {}|"
1018
- "Cannot use name of an existing column for indicator"
1019
- " column"
1016
+ "Cannot use `indicator=True` option when data contains a "
1017
+ "column named {}|"
1018
+ "Cannot use name of an existing column for indicator column"
1020
1019
).format (i )
1021
1020
with pytest .raises (ValueError , match = msg ):
1022
1021
merge (df1 , df_badcolumn , on = "col1" , how = "outer" , indicator = True )
@@ -1235,8 +1234,8 @@ def test_validation(self):
1235
1234
)
1236
1235
1237
1236
msg = (
1238
- "Merge keys are not unique in either left or right dataset;"
1239
- " not a one-to-one merge"
1237
+ "Merge keys are not unique in either left or right dataset; "
1238
+ "not a one-to-one merge"
1240
1239
)
1241
1240
with pytest .raises (MergeError , match = msg ):
1242
1241
merge (left , right , on = "a" , validate = "1:1" )
0 commit comments