Skip to content

Commit 3929b17

Browse files
committed
Fixup
1 parent 3060169 commit 3929b17

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

pandas/core/frame.py

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,17 @@
304304
or number (0, 1).""",
305305
}
306306

307-
_merge_doc = """
307+
_how = {
308+
"left",
309+
"right",
310+
"outer",
311+
"inner",
312+
"left_semi",
313+
"cross",
314+
"left_anti",
315+
"right_anti",
316+
}
317+
_merge_doc = f"""
308318
Merge DataFrame or named Series objects with a database-style join.
309319
310320
A named Series object is treated as a DataFrame with a single named column.
@@ -325,8 +335,7 @@
325335
----------%s
326336
right : DataFrame or named Series
327337
Object to merge with.
328-
how : {'left', 'right', 'outer', 'inner', 'left_semi',
329-
'cross', 'left_anti', 'right_anti'},
338+
how : {_how},
330339
default 'inner'
331340
Type of merge to be performed.
332341
@@ -426,9 +435,11 @@
426435
427436
Examples
428437
--------
429-
>>> df1 = pd.DataFrame({'lkey': ['foo', 'bar', 'baz', 'foo'],
438+
>>> df1 = pd.DataFrame({
439+
"lkey": ['foo', 'bar', 'baz', 'foo'],
430440
... 'value': [1, 2, 3, 5]})
431-
>>> df2 = pd.DataFrame({'rkey': ['foo', 'bar', 'baz', 'foo'],
441+
>>> df2 = pd.DataFrame({
442+
"rkey": ['foo', 'bar', 'baz', 'foo'],
432443
... 'value': [5, 6, 7, 8]})
433444
>>> df1
434445
lkey value
@@ -477,8 +488,8 @@
477488
ValueError: columns overlap but no suffix specified:
478489
Index(['value'], dtype='object')
479490
480-
>>> df1 = pd.DataFrame({'a': ['foo', 'bar'], 'b': [1, 2]})
481-
>>> df2 = pd.DataFrame({'a': ['foo', 'baz'], 'c': [3, 4]})
491+
>>> df1 = pd.DataFrame({"a": ['foo', 'bar'], 'b': [1, 2]})
492+
>>> df2 = pd.DataFrame({"a": ['foo', 'baz'], 'c': [3, 4]})
482493
>>> df1
483494
a b
484495
0 foo 1
@@ -497,8 +508,8 @@
497508
0 foo 1 3.0
498509
1 bar 2 NaN
499510
500-
>>> df1 = pd.DataFrame({'left': ['foo', 'bar']})
501-
>>> df2 = pd.DataFrame({'right': [7, 8]})
511+
>>> df1 = pd.DataFrame({"left": ['foo', 'bar']})
512+
>>> df2 = pd.DataFrame({"right": [7, 8]})
502513
>>> df1
503514
left
504515
0 foo

0 commit comments

Comments
 (0)