Skip to content

Commit c18c6cb

Browse files
committed
Undo change to merge.py and make whatsnew a 2 line comment.
1 parent db13c3b commit c18c6cb

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

doc/source/whatsnew/v0.20.0.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,8 @@ Bug Fixes
351351
- Bug in converting object elements of array-like objects to unsigned 64-bit integers (:issue:`4471`, :issue:`14982`)
352352
- Bug in ``pd.pivot_table()`` where no error was raised when values argument was not in the columns (:issue:`14938`)
353353

354-
- Bug in ``DataFrame.groupby().describe()`` when grouping on ``Index`` containing tuples. Raise `ValueError` if creating an `Index` with tuples and not passing a list of names (:issue:`14848`)
354+
- Bug in ``DataFrame.groupby().describe()`` when grouping on ``Index`` containing tuples (:issue:`14848`)
355+
- Raise `ValueError` if creating a `MultiIndex` with tuples and not passing a list of names (:issue:`15110`)
355356

356357

357358

pandas/tools/merge.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -1626,11 +1626,7 @@ def __init__(self, objs, axis=0, join='outer', join_axes=None,
16261626
clean_objs.append(v)
16271627
objs = clean_objs
16281628
name = getattr(keys, 'name', None)
1629-
# GH 14848
1630-
# If you already have an Index, no need
1631-
# to recreate it
1632-
if not isinstance(keys, Index):
1633-
keys = Index(clean_keys, name=name)
1629+
keys = Index(clean_keys, name=name)
16341630

16351631
if len(objs) == 0:
16361632
raise ValueError('All objects passed were None')

0 commit comments

Comments
 (0)