python
diff --git a/‎docs/api.rst
Copy file name to clipboardExpand all lines: docs/api.rst
+8Lines changed: 8 additions & 0 deletions b/‎docs/api.rst
Copy file name to clipboardExpand all lines: docs/api.rst
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎docs/changelog.rst
Copy file name to clipboardExpand all lines: docs/changelog.rst
+4-2Lines changed: 4 additions & 2 deletions b/‎docs/changelog.rst
Copy file name to clipboardExpand all lines: docs/changelog.rst
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/‎pythoncapi_compat.h
Copy file name to clipboardExpand all lines: pythoncapi_compat.h
+44-3Lines changed: 44 additions & 3 deletions b/‎pythoncapi_compat.h
Copy file name to clipboardExpand all lines: pythoncapi_compat.h
+44-3Lines changed: 44 additions & 3 deletions
diff --git a/‎tests/test_pythoncapi_compat_cext.c
Copy file name to clipboardExpand all lines: tests/test_pythoncapi_compat_cext.c
+45Lines changed: 45 additions & 0 deletions b/‎tests/test_pythoncapi_compat_cext.c
Copy file name to clipboardExpand all lines: tests/test_pythoncapi_compat_cext.c
+45Lines changed: 45 additions & 0 deletions
@@ -43,6 +43,14 @@ Python 3.13
 
    See `PyObject_GetOptionalAttrString() documentation <https://docs.python.org/dev/c-api/object.html#c.PyObject_GetOptionalAttrString>`__.
 
+.. c:function:: int PyMapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **result)
+
+   See `PyMapping_GetOptionalItem() documentation <https://docs.python.org/dev/c-api/mapping.html#c.PyMapping_GetOptionalItem>`__.
+
+.. c:function:: int PyMapping_GetOptionalItemString(PyObject *obj, const char *key, PyObject **result)
+
+   See `PyMapping_GetOptionalItemString() documentation <https://docs.python.org/dev/c-api/mapping.html#c.PyMapping_GetOptionalItemString>`__.
+
 
 Python 3.12
 -----------
 
@@ -1,8 +1,10 @@
 Changelog
 =========
 
-* 2023-07-12: Add ``PyObject_GetOptionalAttr()`` and
-  ``PyObject_GetOptionalAttrString()`` functions.
+* 2023-07-12: Add ``PyObject_GetOptionalAttr()``,
+  ``PyObject_GetOptionalAttrString()``,
+  ``PyMapping_GetOptionalItem()``
+  and ``PyMapping_GetOptionalItemString()`` functions.
 * 2023-07-05: Add ``PyObject_Vectorcall()`` function.
 * 2023-06-21: Add ``PyWeakref_GetRef()`` function.
 * 2023-06-20: Add ``PyImport_AddModuleRef()`` function.
 
@@ -284,7 +284,11 @@ PYCAPI_COMPAT_STATIC_INLINE(PyObject*)
 PyFrame_GetVarString(PyFrameObject *frame, const char *name)
 {
     PyObject *name_obj, *value;
+#if PY_VERSION_HEX >= 0x03000000
     name_obj = PyUnicode_FromString(name);
+#else
+    name_obj = PyString_FromString(name);
+#endif
     if (name_obj == NULL) {
         return NULL;
     }
@@ -723,9 +727,10 @@ PyObject_GetOptionalAttr(PyObject *obj, PyObject *name, PyObject **result)
 }
 
 PYCAPI_COMPAT_STATIC_INLINE(int)
-PyObject_GetOptionalAttrString(PyObject *obj, const char *name, PyObject **presult)
+PyObject_GetOptionalAttrString(PyObject *obj, const char *name, PyObject **result)
 {
     PyObject *name_obj;
+    int rc;
 #if PY_VERSION_HEX >= 0x03000000
     name_obj = PyUnicode_FromString(name);
 #else
@@ -734,9 +739,45 @@ PyObject_GetOptionalAttrString(PyObject *obj, const char *name, PyObject **presu
     if (name_obj == NULL) {
         return -1;
     }
-    int res = PyObject_GetOptionalAttr(obj, name_obj, presult);
+    rc = PyObject_GetOptionalAttr(obj, name_obj, result);
     Py_DECREF(name_obj);
-    return res;
+    return rc;
+}
+#endif
+
+
+// gh-106307 added PyObject_GetOptionalAttr() to Python 3.13.0a1
+#if PY_VERSION_HEX < 0x030D00A1
+PYCAPI_COMPAT_STATIC_INLINE(int)
+PyMapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **result)
+{
+    *result = PyObject_GetItem(obj, key);
+    if (*result) {
+        return 1;
+    }
+    if (!PyErr_ExceptionMatches(PyExc_KeyError)) {
+        return -1;
+    }
+    PyErr_Clear();
+    return 0;
+}
+
+PYCAPI_COMPAT_STATIC_INLINE(int)
+PyMapping_GetOptionalItemString(PyObject *obj, const char *key, PyObject **result)
+{
+    PyObject *key_obj;
+    int rc;
+#if PY_VERSION_HEX >= 0x03000000
+    key_obj = PyUnicode_FromString(key);
+#else
+    key_obj = PyString_FromString(key);
+#endif
+    if (key_obj == NULL) {
+        return -1;
+    }
+    rc = PyMapping_GetOptionalItem(obj, key_obj, result);
+    Py_DECREF(key_obj);
+    return rc;
 }
 #endif
 
 
@@ -990,6 +990,50 @@ test_getattr(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
 }
 
 
+static PyObject *
+test_getitem(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
+{
+    assert(!PyErr_Occurred());
+
+    PyObject *value = Py_BuildValue("s", "value");
+    assert(value != NULL);
+    PyObject *obj = Py_BuildValue("{sO}", "key", value);
+    assert(obj != NULL);
+    PyObject *key;
+    PyObject *item;
+
+    // test PyMapping_GetOptionalItem(): key is present
+    key = create_string("key");
+    item = Py_True;  // marker value
+    assert(PyMapping_GetOptionalItem(obj, key, &item) == 1);
+    assert(item == value);
+    Py_DECREF(item);
+    Py_DECREF(key);
+
+    // test PyMapping_GetOptionalItemString(): key is present
+    item = Py_True;  // marker value
+    assert(PyMapping_GetOptionalItemString(obj, "key", &item) == 1);
+    assert(item == value);
+    Py_DECREF(item);
+
+    // test PyMapping_GetOptionalItem(): missing key
+    key = create_string("dontexist");
+    item = Py_True;  // marker value
+    assert(PyMapping_GetOptionalItem(obj, key, &item) == 0);
+    assert(item == NULL);
+    Py_DECREF(key);
+
+    // test PyMapping_GetOptionalItemString(): missing key
+    item = Py_True;  // marker value
+    assert(PyMapping_GetOptionalItemString(obj, "dontexist", &item) == 0);
+    assert(item == NULL);
+
+    Py_DECREF(obj);
+    Py_DECREF(value);
+    Py_RETURN_NONE;
+}
+
+
 static struct PyMethodDef methods[] = {
     {"test_object", test_object, METH_NOARGS, _Py_NULL},
     {"test_py_is", test_py_is, METH_NOARGS, _Py_NULL},
@@ -1013,6 +1057,7 @@ static struct PyMethodDef methods[] = {
     {"func_varargs", (PyCFunction)(void*)func_varargs, METH_VARARGS | METH_KEYWORDS, _Py_NULL},
     {"test_vectorcall", test_vectorcall, METH_NOARGS, _Py_NULL},
     {"test_getattr", test_getattr, METH_NOARGS, _Py_NULL},
+    {"test_getitem", test_getitem, METH_NOARGS, _Py_NULL},
     {_Py_NULL, _Py_NULL, 0, _Py_NULL}
 };