numpy
diff --git a/‎numpy/ma/core.py
Lines changed: 2 additions & 32 deletions b/‎numpy/ma/core.py
Lines changed: 2 additions & 32 deletions
diff --git a/‎numpy/ma/tests/test_deprecations.py
Lines changed: 0 additions & 29 deletions b/‎numpy/ma/tests/test_deprecations.py
Lines changed: 0 additions & 29 deletions
@@ -93,33 +93,6 @@
 class MaskedArrayFutureWarning(FutureWarning):
     pass
 
-def _deprecate_argsort_axis(arr, axis):
-    """
-    Takes the array argsort was called upon, and the axis argument
-    it was called with.
-
-    np.ma.argsort has a long-term bug where the default of the axis argument
-    is wrong (gh-8701), which now must be kept for backwards compatibiity.
-    Thankfully, this only makes a difference when arrays are 2- or more-
-    dimensional, so we only need a warning then.
-    """
-    if axis is np._NoValue:
-        if arr.ndim <= 1:
-            # no warning needed - switch to -1 to avoid surprising subclasses
-            return -1
-        else:
-            # 2017-04-10, numpy 1.13.0
-            warnings.warn(
-                "Unlike np.argsort, np.sort, np.ma.sort, and the "
-                "documentation for this function, the default is "
-                "axis=None, not axis=-1. In future, the default will be "
-                "-1. To squash this warning, specify the axis argument "
-                "explicitly.",
-                MaskedArrayFutureWarning, stacklevel=2)
-            return None
-    else:
-        return axis
-
 
 def doc_note(initialdoc, note):
     """
@@ -5255,7 +5228,7 @@ def round(self, decimals=0, out=None):
             out.__setmask__(self._mask)
         return out
 
-    def argsort(self, axis=np._NoValue, kind='quicksort', order=None,
+    def argsort(self, axis=-1, kind='quicksort', order=None,
                 endwith=True, fill_value=None):
         """
         Return an ndarray of indices that sort the array along the
@@ -5311,8 +5284,6 @@ def argsort(self, axis=np._NoValue, kind='quicksort', order=None,
 
         """
 
-        axis = _deprecate_argsort_axis(self, axis)
-
         if fill_value is None:
             if endwith:
                 # nan > inf
@@ -6532,10 +6503,9 @@ def power(a, b, third=None):
 argmin = _frommethod('argmin')
 argmax = _frommethod('argmax')
 
-def argsort(a, axis=np._NoValue, kind='quicksort', order=None, endwith=True, fill_value=None):
+def argsort(a, axis=-1, kind='quicksort', order=None, endwith=True, fill_value=None):
     "Function version of the eponymous method."
     a = np.asanyarray(a)
-    axis = _deprecate_argsort_axis(a, axis)
 
     if isinstance(a, MaskedArray):
         return a.argsort(axis=axis, kind=kind, order=order,
 
@@ -8,34 +8,5 @@
 from numpy.ma.testutils import assert_equal
 
 
-class TestArgsort(TestCase):
-	""" gh-8701 """
-	def _test_base(self, argsort, cls):
-		arr_0d = np.array(1).view(cls)
-		argsort(arr_0d)
-
-		arr_1d = np.array([1, 2, 3]).view(cls)
-		argsort(arr_1d)
-
-		# argsort has a bad default for >1d arrays
-		arr_2d = np.array([[1, 2], [3, 4]]).view(cls)
-		result = assert_warns(
-			np.ma.core.MaskedArrayFutureWarning, argsort, arr_2d)
-		assert_equal(result, argsort(arr_2d, axis=None))
-
-		# should be no warnings for explictly specifiying it
-		argsort(arr_2d, axis=None)
-		argsort(arr_2d, axis=-1)
-
-	def test_function_ndarray(self):
-		return self._test_base(np.ma.argsort, np.ndarray)
-
-	def test_function_maskedarray(self):
-		return self._test_base(np.ma.argsort, np.ma.MaskedArray)
-
-	def test_method(self):
-		return self._test_base(np.ma.MaskedArray.argsort, np.ma.MaskedArray)
-
-
 if __name__ == "__main__":
     run_module_suite()