From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 17 Dec 2022 07:49:49 +0000 (-0800)
Subject: Docs: Use `PY_VERSION_HEX` for version comparison (GH-100179)
X-Git-Tag: v3.11.2~169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf0a334c4e46041c5621f0271cb70feef934c501;p=thirdparty%2FPython%2Fcpython.git

Docs: Use `PY_VERSION_HEX` for version comparison (GH-100179)

(cherry picked from commit 0264f634f720fbf12afaf1715a53cd1495fbd85b)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
---

diff --git a/Doc/c-api/apiabiversion.rst b/Doc/c-api/apiabiversion.rst
index 85b6e2f37387..62d542966622 100644
--- a/Doc/c-api/apiabiversion.rst
+++ b/Doc/c-api/apiabiversion.rst
@@ -58,6 +58,8 @@ See :ref:`stable` for a discussion of API and ABI stability across versions.
    Thus ``3.4.1a2`` is hexversion ``0x030401a2`` and ``3.10.0`` is
    hexversion ``0x030a00f0``.
 
+   Use this for numeric comparisons, e.g. ``#if PY_VERSION_HEX >= ...``.
+
    This version is also available via the symbol :data:`Py_Version`.
 
 .. c:var:: const unsigned long Py_Version
diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index f09ccb133fbc..4244875f6c69 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -2320,7 +2320,7 @@ Porting to Python 3.11
   can define the following macros and use them throughout
   the code (credit: these were copied from the ``mypy`` codebase)::
 
-    #if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 8
+    #if PY_VERSION_HEX >= 0x03080000
     #  define CPy_TRASHCAN_BEGIN(op, dealloc) Py_TRASHCAN_BEGIN(op, dealloc)
     #  define CPy_TRASHCAN_END(op) Py_TRASHCAN_END
     #else