Merge branch 'main' into struct-AC/143672

Author: serhiy-storchaka

Doc/c-api/memory.rst

@@ -293,17 +293,39 @@ The following type-oriented macros are provided for convenience.  Note  that
 
    Same as :c:func:`PyMem_Free`.
 
-In addition, the following macro sets are provided for calling the Python memory
-allocator directly, without involving the C API functions listed above. However,
-note that their use does not preserve binary compatibility across Python
-versions and is therefore deprecated in extension modules.
-
-* ``PyMem_MALLOC(size)``
-* ``PyMem_NEW(type, size)``
-* ``PyMem_REALLOC(ptr, size)``
-* ``PyMem_RESIZE(ptr, type, size)``
-* ``PyMem_FREE(ptr)``
-* ``PyMem_DEL(ptr)``
+
+Deprecated aliases
+------------------
+
+These are :term:`soft deprecated` aliases to existing functions and macros.
+They exist solely for backwards compatibility.
+
+.. list-table::
+   :widths: auto
+   :header-rows: 1
+
+   * * Deprecated alias
+     * Corresponding function or macro
+   * * .. c:macro:: PyMem_MALLOC(size)
+     * :c:func:`PyMem_Malloc`
+   * * .. c:macro:: PyMem_NEW(type, size)
+     * :c:macro:`PyMem_New`
+   * * .. c:macro:: PyMem_REALLOC(ptr, size)
+     * :c:func:`PyMem_Realloc`
+   * * .. c:macro:: PyMem_RESIZE(ptr, type, size)
+     * :c:macro:`PyMem_Resize`
+   * * .. c:macro:: PyMem_FREE(ptr)
+     * :c:func:`PyMem_Free`
+   * * .. c:macro:: PyMem_DEL(ptr)
+     * :c:func:`PyMem_Free`
+
+.. versionchanged:: 3.4
+
+   The macros are now aliases of the corresponding functions and macros.
+   Previously, their behavior was the same, but their use did not necessarily
+   preserve binary compatibility across Python versions.
+
+.. deprecated:: 2.0
 
 
 .. _objectinterface:

Lib/test/test_time.py

@@ -192,18 +192,29 @@ def test_gmtime(self):
         # (tm_year, tm_mon, tm_mday,
         #  tm_hour, tm_min, tm_sec,
         #  tm_wday, tm_yday)
-        for t, expected in (
+        tests = [
             (-13262400, (1969, 7, 31, 12, 0, 0, 3, 212)),
             (-6177600, (1969, 10, 21, 12, 0, 0, 1, 294)),
-            # non-leap years (pre epoch)
-            (-2203891200, (1900, 3, 1, 0, 0, 0, 3, 60)),
-            (-2203977600, (1900, 2, 28, 0, 0, 0, 2, 59)),
-            (-5359564800, (1800, 3, 1, 0, 0, 0, 5, 60)),
-            (-5359651200, (1800, 2, 28, 0, 0, 0, 4, 59)),
             # leap years (pre epoch)
             (-2077660800, (1904, 3, 1, 0, 0, 0, 1, 61)),
             (-2077833600, (1904, 2, 28, 0, 0, 0, 6, 59)),
-        ):
+        ]
+
+        try:
+            from _testinternalcapi import SIZEOF_TIME_T
+        except ImportError:
+            pass
+        else:
+            if SIZEOF_TIME_T >= 8:
+                tests.extend((
+                    # non-leap years (pre epoch)
+                    (-2203891200, (1900, 3, 1, 0, 0, 0, 3, 60)),
+                    (-2203977600, (1900, 2, 28, 0, 0, 0, 2, 59)),
+                    (-5359564800, (1800, 3, 1, 0, 0, 0, 5, 60)),
+                    (-5359651200, (1800, 2, 28, 0, 0, 0, 4, 59)),
+                ))
+
+        for t, expected in tests:
             with self.subTest(t=t, expected=expected):
                 res = time.gmtime(t)
                 self.assertEqual(tuple(res)[:8], expected, res)