From 0e34ce05524e7a737cf55481cbf2e2cd826f8f14 Mon Sep 17 00:00:00 2001 From: Jordan Erenrich Date: Wed, 21 Sep 2016 21:31:45 +0800 Subject: [PATCH 1/4] Fixed typo in ordered_merge warning Minor typo in warning --- pandas/tools/merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tools/merge.py b/pandas/tools/merge.py index 6521acbd0b733..68c1283291782 100644 --- a/pandas/tools/merge.py +++ b/pandas/tools/merge.py @@ -146,7 +146,7 @@ def ordered_merge(left, right, on=None, left_by=None, right_by=None, fill_method=None, suffixes=('_x', '_y')): - warnings.warn("ordered_merge is deprecated and replace by merged_ordered", + warnings.warn("ordered_merge is deprecated and replace by merge_ordered", FutureWarning, stacklevel=2) return merge_ordered(left, right, on=on, left_on=left_on, right_on=right_on, From cbb11dad54b09543570e53820c0500d63224fead Mon Sep 17 00:00:00 2001 From: Jordan Erenrich Date: Wed, 21 Sep 2016 21:32:56 +0800 Subject: [PATCH 2/4] Revert "Fixed typo in ordered_merge warning" This reverts commit 0e34ce05524e7a737cf55481cbf2e2cd826f8f14. --- pandas/tools/merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tools/merge.py b/pandas/tools/merge.py index 68c1283291782..6521acbd0b733 100644 --- a/pandas/tools/merge.py +++ b/pandas/tools/merge.py @@ -146,7 +146,7 @@ def ordered_merge(left, right, on=None, left_by=None, right_by=None, fill_method=None, suffixes=('_x', '_y')): - warnings.warn("ordered_merge is deprecated and replace by merge_ordered", + warnings.warn("ordered_merge is deprecated and replace by merged_ordered", FutureWarning, stacklevel=2) return merge_ordered(left, right, on=on, left_on=left_on, right_on=right_on, From 214e81cd70e0f2acae5ded1a51f9b7332cb8148b Mon Sep 17 00:00:00 2001 From: Jordan Erenrich Date: Wed, 21 Sep 2016 21:34:53 +0800 Subject: [PATCH 3/4] DOC: Fixed typo in warning Minor typo in warning --- pandas/tools/merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tools/merge.py b/pandas/tools/merge.py index 6521acbd0b733..68c1283291782 100644 --- a/pandas/tools/merge.py +++ b/pandas/tools/merge.py @@ -146,7 +146,7 @@ def ordered_merge(left, right, on=None, left_by=None, right_by=None, fill_method=None, suffixes=('_x', '_y')): - warnings.warn("ordered_merge is deprecated and replace by merged_ordered", + warnings.warn("ordered_merge is deprecated and replace by merge_ordered", FutureWarning, stacklevel=2) return merge_ordered(left, right, on=on, left_on=left_on, right_on=right_on, From 64e97d6921a73d27ec0a20e289216b61524a85cf Mon Sep 17 00:00:00 2001 From: Jordan Erenrich Date: Thu, 22 Sep 2016 18:58:09 +0800 Subject: [PATCH 4/4] DOC: Fixed typo in warning --- pandas/tools/merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tools/merge.py b/pandas/tools/merge.py index 68c1283291782..8cdde8d92b28f 100644 --- a/pandas/tools/merge.py +++ b/pandas/tools/merge.py @@ -146,7 +146,7 @@ def ordered_merge(left, right, on=None, left_by=None, right_by=None, fill_method=None, suffixes=('_x', '_y')): - warnings.warn("ordered_merge is deprecated and replace by merge_ordered", + warnings.warn("ordered_merge is deprecated and replaced by merge_ordered", FutureWarning, stacklevel=2) return merge_ordered(left, right, on=on, left_on=left_on, right_on=right_on,