diff --git a/asv_bench/benchmarks/join_merge.py b/asv_bench/benchmarks/join_merge.py index c1f1a88a5ce62..3b0e33b72ddc1 100644 --- a/asv_bench/benchmarks/join_merge.py +++ b/asv_bench/benchmarks/join_merge.py @@ -1,6 +1,10 @@ from .pandas_vb_common import * -from pandas import merge_ordered +try: + from pandas import merge_ordered +except ImportError: + from pandas import ordered_merge as merge_ordered + # ---------------------------------------------------------------------- # Append diff --git a/pandas/core/reshape/merge.py b/pandas/core/reshape/merge.py index a360500510264..e4b31939250a7 100644 --- a/pandas/core/reshape/merge.py +++ b/pandas/core/reshape/merge.py @@ -1067,7 +1067,7 @@ def _get_join_indexers(left_keys, right_keys, sort=False, how='inner', class _OrderedMerge(_MergeOperation): - _merge_type = 'merge_ordered' + _merge_type = 'ordered_merge' def __init__(self, left, right, on=None, left_on=None, right_on=None, left_index=False, right_index=False, axis=1,