Apply review comments

mtsokol · mtsokol · commit e411971193af · 2025-05-13T16:12:05.000Z
diff --git a/doc/release/upcoming_changes/28678.deprecation.rst b/doc/release/upcoming_changes/28678.deprecation.rst
@@ -1,4 +1,4 @@
-* ``arr.T`` property has been deprecated for array scalars and arrays with dimensionality
+* The ``arr.T`` property has been deprecated for array scalars and arrays with dimensionality
   different than ``2`` to be compatible with the Array API standard. To achieve similar
   behavior when ``arr.ndim != 2``, either ``arr.transpose()``, or ``arr.mT`` (swaps
   the last two axes only), or ``np.permute_dims(arr, range(arr.ndim)[::-1])`` (compatible
diff --git a/numpy/_core/src/multiarray/getset.c b/numpy/_core/src/multiarray/getset.c
@@ -852,10 +852,10 @@ array_transpose_get(PyArrayObject *self, void *NPY_UNUSED(ignored))
     if (ndim != 2) {
         /* Deprecated 2025-04-19, NumPy 2.3 */
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
-                "In the future `.T` property will be supported for "
-                "2-dim arrays only. Received %d-dim array. Either "
-                "`arr.transpose()` or `.mT` (which swaps the last "
-                "two axes only) should be used instead."
+                "In the future, the `.T` property will be supported for "
+                "2-dimensional arrays only. Received %d-dimensional "
+                "array. Either `arr.transpose()` or `.mT` (which swaps "
+                "the last two axes only) should be used instead."
                 "(Deprecated NumPy 2.3)", ndim) < 0) {
             return NULL;
         }
diff --git a/numpy/_core/src/multiarray/scalartypes.c.src b/numpy/_core/src/multiarray/scalartypes.c.src
@@ -1927,9 +1927,9 @@ gentype_transpose_get(PyObject *self, void *NPY_UNUSED(ignored))
 {
     /* Deprecated 2025-04-19, NumPy 2.3 */
     if (DEPRECATE(
-            "In the future `.T` property for array scalars will "
-            "raise an error. If you call `.T` on an array scalar "
-            "intentionally you can safely drop it. In other cases "
+            "In the future, the `.T` property for array scalars will "
+            "raise an error. If you called `.T` on an array scalar "
+            "intentionally, you can safely drop it. In other cases, "
             "`arr.transpose()` or `.mT` (which swaps the last "
             "two axes only) should be used instead. "
             "(Deprecated NumPy 2.3)") < 0) {
diff --git a/numpy/_core/tests/test_deprecations.py b/numpy/_core/tests/test_deprecations.py
@@ -7,19 +7,10 @@
 import pytest
 
 import numpy as np
-from numpy.testing import (
-    assert_raises, temppath
-    )
+from numpy.testing import assert_raises, temppath
 
-from numpy._core._multiarray_tests import fromstring_null_term_c_api  # noqa: F401
 import numpy._core._struct_ufunc_tests as struct_ufunc
 
-try:
-    import pytz  # noqa: F401
-    _has_pytz = True
-except ImportError:
-    _has_pytz = False
-
 
 class _DeprecationTestCase:
     # Just as warning: warnings uses re.match, so the start of this message
@@ -44,8 +35,7 @@ def setup_method(self):
     def teardown_method(self):
         self.warn_ctx.__exit__()
 
-    def assert_deprecated(self, function, num=1, msg_patterns=None,
-                          ignore_others=False,
+    def assert_deprecated(self, function, num=1, ignore_others=False,
                           function_fails=False,
                           exceptions=np._NoValue,
                           args=(), kwargs={}):
@@ -63,11 +53,6 @@ def assert_deprecated(self, function, num=1, msg_patterns=None,
             The function to test
         num : int
             Number of DeprecationWarnings to expect. This should normally be 1.
-        msg_patterns : str or tuple of str
-            Patterns for which warning messages should match. For `str` each
-            warning should match to the same pattern. For a tuple of `str`
-            each warning should match against the corresponding pattern.
-            For `None` this check is skipped.
         ignore_others : bool
             Whether warnings of the wrong type should be ignored (note that
             the message is not checked)
@@ -99,14 +84,6 @@ def assert_deprecated(self, function, num=1, msg_patterns=None,
         # just in case, clear the registry
         num_found = 0
         for warning in self.log:
-            if msg_patterns is not None:
-                pattern = (msg_patterns if isinstance(msg_patterns, str) else
-                           msg_patterns[num_found])
-                msg = warning.message.args[0]
-                if re.match(pattern, msg) is None:
-                    raise AssertionError(
-                        "expected %s warning message pattern but got: %s" %
-                        (pattern, msg))
             if warning.category is self.warning_cls:
                 num_found += 1
             elif not ignore_others:
@@ -156,17 +133,9 @@ def test_assert_deprecated(self):
                       lambda: None)
 
         def foo():
-            warnings.warn("foo bar", category=DeprecationWarning,
-                          stacklevel=2)
-
-        def foo_many():
             warnings.warn("foo", category=DeprecationWarning, stacklevel=2)
-            warnings.warn("bar", category=DeprecationWarning, stacklevel=2)
 
         test_case_instance.assert_deprecated(foo)
-        test_case_instance.assert_deprecated(foo, msg_patterns="foo")
-        test_case_instance.assert_deprecated(foo_many, num=2,
-                                             msg_patterns=("foo", "^bar$"))
         test_case_instance.teardown_method()
 
 
@@ -475,18 +444,20 @@ def test_deprecated(self):
         )
 
 
-class TestDeprecatedTNon2Dim(_DeprecationTestCase):
-    # Deprecated in Numpy 2.3, 2025-04
+class TestDeprecatedTPropScalar(_DeprecationTestCase):
+    # Deprecated in Numpy 2.3, 2025-05
+    message = ("In the future, the `.T` property for array scalars will "
+               "raise an error.")
+
+    def test_deprecated(self):
+        self.assert_deprecated(lambda: np.int64(1).T)
+
+
+class TestDeprecatedTPropNon2Dim(_DeprecationTestCase):
+    # Deprecated in Numpy 2.3, 2025-05
+    message = ("In the future, the `.T` property will be supported for "
+               r"2-dimensional arrays only. Received \d+-dimensional array.")
+
     def test_deprecated(self):
-        self.assert_deprecated(
-            lambda: np.int64(1).T,
-            msg_patterns="In the future `.T` property for "
-                         "array scalars will raise an error."
-        )
         for shape in [(5,), (2, 3, 4)]:
-            self.assert_deprecated(
-                lambda: np.ones(shape).T,
-                msg_patterns="In the future `.T` property will be "
-                             "supported for 2-dim arrays only. "
-                             f"Received {len(shape)}-dim array."
-            )
+            self.assert_deprecated(lambda: np.ones(shape).T)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-* ``arr.T`` property has been deprecated for array scalars and arrays with dimensionality
	`1`	+* The ``arr.T`` property has been deprecated for array scalars and arrays with dimensionality
`2`	`2`	different than ``2`` to be compatible with the Array API standard. To achieve similar
`3`	`3`	behavior when ``arr.ndim != 2``, either ``arr.transpose()``, or ``arr.mT`` (swaps
`4`	`4`	the last two axes only), or ``np.permute_dims(arr, range(arr.ndim)[::-1])`` (compatible