@@ -139,19 +139,6 @@ def _groupby_and_merge(by, on, left, right, _merge_pieces,
139139 return result , lby
140140
141141
142- def ordered_merge (left , right , on = None ,
143- left_on = None , right_on = None ,
144- left_by = None , right_by = None ,
145- fill_method = None , suffixes = ('_x' , '_y' )):
146-
147- warnings .warn ("ordered_merge is deprecated and replaced by merge_ordered" ,
148- FutureWarning , stacklevel = 2 )
149- return merge_ordered (left , right , on = on ,
150- left_on = left_on , right_on = right_on ,
151- left_by = left_by , right_by = right_by ,
152- fill_method = fill_method , suffixes = suffixes )
153-
154-
155142def merge_ordered (left , right , on = None ,
156143 left_on = None , right_on = None ,
157144 left_by = None , right_by = None ,
@@ -204,7 +191,7 @@ def merge_ordered(left, right, on=None,
204191 4 c 2 b
205192 5 e 3 b
206193
207- >>> ordered_merge (A, B, fill_method='ffill', left_by='group')
194+ >>> merge_ordered (A, B, fill_method='ffill', left_by='group')
208195 key lvalue group rvalue
209196 0 a 1 a NaN
210197 1 b 1 a 1
@@ -253,9 +240,6 @@ def _merger(x, y):
253240 return result
254241
255242
256- ordered_merge .__doc__ = merge_ordered .__doc__
257-
258-
259243def merge_asof (left , right , on = None ,
260244 left_on = None , right_on = None ,
261245 left_index = False , right_index = False ,
0 commit comments