From 675c4b537098188c6260d2108e280c12c0c9978a Mon Sep 17 00:00:00 2001 From: Dave Willmer Date: Wed, 23 Nov 2016 00:17:17 +0000 Subject: [PATCH] Fix typo in doctests --- pandas/tools/merge.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/tools/merge.py b/pandas/tools/merge.py index d2060185c3246..8d2f92ad58a88 100644 --- a/pandas/tools/merge.py +++ b/pandas/tools/merge.py @@ -371,7 +371,7 @@ def merge_asof(left, right, on=None, By default we are taking the asof of the quotes - >>> pd.asof_merge(trades, quotes, + >>> pd.merge_asof(trades, quotes, ... on='time', ... by='ticker') time ticker price quantity bid ask @@ -383,7 +383,7 @@ def merge_asof(left, right, on=None, We only asof within 2ms betwen the quote time and the trade time - >>> pd.asof_merge(trades, quotes, + >>> pd.merge_asof(trades, quotes, ... on='time', ... by='ticker', ... tolerance=pd.Timedelta('2ms')) @@ -398,7 +398,7 @@ def merge_asof(left, right, on=None, and we exclude exact matches on time. However *prior* data will propogate forward - >>> pd.asof_merge(trades, quotes, + >>> pd.merge_asof(trades, quotes, ... on='time', ... by='ticker', ... tolerance=pd.Timedelta('10ms'),