From: ysau <yatshan.au@gmail.com>
Date: Fri, 21 Jul 2017 23:29:12 +0000 (-0700)
Subject: # Issue 17046 # # modified: /pandas/tests/indexes/test_base.py, # /doc/source/whatsne... 
X-Git-Tag: archive/raspbian/0.20.3-11+rpi1~2^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=75b81603d1b730defd2ebd9e218a8334465a2284;p=pandas.git

# Issue 17046 # # modified: /pandas/tests/indexes/test_base.py, # /doc/source/whatsnew/v0.21.0.txt # # Include both '>' and '<' in the error message in # TestMixedIntIndex.test_argsort and # TestMixedIntIndex.test_numpy_argsort

Modified: Mo Zhou <cdluminate@gmail.com>
Modification Note: Part of the original patch doesn't apply.
 Removed modification to doc/source/whatsnew/v0.21.0.txt from the original
 patch.


Gbp-Pq: Name up_tst_np_argsort_comparison2
---

diff --git a/pandas/tests/indexes/test_base.py b/pandas/tests/indexes/test_base.py
index d9f8e5e7..a48e98a8 100644
--- a/pandas/tests/indexes/test_base.py
+++ b/pandas/tests/indexes/test_base.py
@@ -1818,7 +1818,7 @@ class TestMixedIntIndex(Base):
     def test_argsort(self):
         idx = self.create_index()
         if PY36:
-            with tm.assert_raises_regex(TypeError, "'>' not supported"):
+            with tm.assert_raises_regex(TypeError, "'>|<' not supported"):
                 result = idx.argsort()
         elif PY3:
             with tm.assert_raises_regex(TypeError, "unorderable types"):
@@ -1831,7 +1831,7 @@ class TestMixedIntIndex(Base):
     def test_numpy_argsort(self):
         idx = self.create_index()
         if PY36:
-            with tm.assert_raises_regex(TypeError, "'>' not supported"):
+            with tm.assert_raises_regex(TypeError, "'>|<' not supported"):
                 result = np.argsort(idx)
         elif PY3:
             with tm.assert_raises_regex(TypeError, "unorderable types"):