Skip to content

Commit 94593d4

Browse files
committed
Revert "Fixup"
This reverts commit 3929b17.
1 parent 3929b17 commit 94593d4

File tree

1 file changed

+9
-20
lines changed

1 file changed

+9
-20
lines changed

pandas/core/frame.py

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

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"""
307+
_merge_doc = """
318308
Merge DataFrame or named Series objects with a database-style join.
319309
320310
A named Series object is treated as a DataFrame with a single named column.
@@ -335,7 +325,8 @@
335325
----------%s
336326
right : DataFrame or named Series
337327
Object to merge with.
338-
how : {_how},
328+
how : {'left', 'right', 'outer', 'inner', 'left_semi',
329+
'cross', 'left_anti', 'right_anti'},
339330
default 'inner'
340331
Type of merge to be performed.
341332
@@ -435,11 +426,9 @@
435426
436427
Examples
437428
--------
438-
>>> df1 = pd.DataFrame({
439-
"lkey": ['foo', 'bar', 'baz', 'foo'],
429+
>>> df1 = pd.DataFrame({'lkey': ['foo', 'bar', 'baz', 'foo'],
440430
... 'value': [1, 2, 3, 5]})
441-
>>> df2 = pd.DataFrame({
442-
"rkey": ['foo', 'bar', 'baz', 'foo'],
431+
>>> df2 = pd.DataFrame({'rkey': ['foo', 'bar', 'baz', 'foo'],
443432
... 'value': [5, 6, 7, 8]})
444433
>>> df1
445434
lkey value
@@ -488,8 +477,8 @@
488477
ValueError: columns overlap but no suffix specified:
489478
Index(['value'], dtype='object')
490479
491-
>>> df1 = pd.DataFrame({"a": ['foo', 'bar'], 'b': [1, 2]})
492-
>>> df2 = pd.DataFrame({"a": ['foo', 'baz'], 'c': [3, 4]})
480+
>>> df1 = pd.DataFrame({'a': ['foo', 'bar'], 'b': [1, 2]})
481+
>>> df2 = pd.DataFrame({'a': ['foo', 'baz'], 'c': [3, 4]})
493482
>>> df1
494483
a b
495484
0 foo 1
@@ -508,8 +497,8 @@
508497
0 foo 1 3.0
509498
1 bar 2 NaN
510499
511-
>>> df1 = pd.DataFrame({"left": ['foo', 'bar']})
512-
>>> df2 = pd.DataFrame({"right": [7, 8]})
500+
>>> df1 = pd.DataFrame({'left': ['foo', 'bar']})
501+
>>> df2 = pd.DataFrame({'right': [7, 8]})
513502
>>> df1
514503
left
515504
0 foo

0 commit comments

Comments
 (0)