Skip to content

Commit 0e3f539

Browse files
author
tp
committed
update removal of ordered_merge as per comments
1 parent ad647c0 commit 0e3f539

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

asv_bench/benchmarks/join_merge.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
from .pandas_vb_common import *
22

3-
from pandas import merge_ordered
3+
try:
4+
from pandas import merge_ordered
5+
except ImportError:
6+
from pandas import ordered_merge as merge_ordered
7+
48

59
# ----------------------------------------------------------------------
610
# Append

pandas/core/reshape/merge.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ def _get_join_indexers(left_keys, right_keys, sort=False, how='inner',
10671067

10681068

10691069
class _OrderedMerge(_MergeOperation):
1070-
_merge_type = 'merge_ordered'
1070+
_merge_type = 'ordered_merge'
10711071

10721072
def __init__(self, left, right, on=None, left_on=None, right_on=None,
10731073
left_index=False, right_index=False, axis=1,

0 commit comments

Comments
 (0)