Skip to content

Commit 2d689ad

Browse files
committed
Updated comment in test_join
GH21220
1 parent 12da2ce commit 2d689ad

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

pandas/tests/reshape/merge/test_join.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,9 @@ def test_join_on_fails_with_different_column_counts(self):
230230

231231
def test_join_on_fails_with_wrong_object_type(self):
232232
# GH12081
233-
""" GH21220 - merging of Series and DataFrame is now allowed
234-
Edited the test to remove the Series object from 'wrongly_typed'
235-
"""
236233
wrongly_typed = [2, 'str', None, np.array([0, 1])]
234+
# GH21220 - merging of Series and DataFrame is now allowed
235+
# Edited the test to remove the Series object from 'wrongly_typed'
237236
df = DataFrame({'a': [1, 1]})
238237

239238
for obj in wrongly_typed:

0 commit comments

Comments
 (0)