Make PyAnyDict_Check() public

Author: vstinner

Include/cpython/dictobject.h

@@ -37,9 +37,9 @@ PyAPI_DATA(PyTypeObject) PyFrozenDict_Type;
 #define PyFrozenDict_Check(op) PyObject_TypeCheck((op), &PyFrozenDict_Type)
 #define PyFrozenDict_CheckExact(op) Py_IS_TYPE((op), &PyFrozenDict_Type)
 
-#define _PyAnyDict_CheckExact(ob) \
+#define PyAnyDict_CheckExact(ob) \
     (PyDict_CheckExact(ob) || PyFrozenDict_CheckExact(ob))
-#define _PyAnyDict_Check(ob) \
+#define PyAnyDict_Check(ob) \
     (PyDict_Check(ob) || PyFrozenDict_Check(ob))
 
 PyAPI_FUNC(PyObject *) _PyDict_GetItem_KnownHash(PyObject *mp, PyObject *key,
@@ -62,7 +62,7 @@ PyAPI_FUNC(int) PyDict_SetDefaultRef(PyObject *mp, PyObject *key, PyObject *defa
 /* Get the number of items of a dictionary. */
 static inline Py_ssize_t PyDict_GET_SIZE(PyObject *op) {
     PyDictObject *mp;
-    assert(_PyAnyDict_Check(op));
+    assert(PyAnyDict_Check(op));
     mp = _Py_CAST(PyDictObject*, op);
 #ifdef Py_GIL_DISABLED
     return _Py_atomic_load_ssize_relaxed(&mp->ma_used);

Modules/_collectionsmodule.c

@@ -2403,7 +2403,7 @@ defdict_or(PyObject* left, PyObject* right)
         self = right;
         other = left;
     }
-    if (!_PyAnyDict_Check(other)) {
+    if (!PyAnyDict_Check(other)) {
         Py_RETURN_NOTIMPLEMENTED;
     }
     // Like copy(), this calls the object's class.

Modules/_pickle.c

@@ -325,7 +325,7 @@ _Pickle_InitState(PickleState *st)
         PyObject_GetAttrString(compat_pickle, "NAME_MAPPING");
     if (!st->name_mapping_2to3)
         goto error;
-    if (!_PyAnyDict_CheckExact(st->name_mapping_2to3)) {
+    if (!PyAnyDict_CheckExact(st->name_mapping_2to3)) {
         PyErr_Format(PyExc_RuntimeError,
                      "_compat_pickle.NAME_MAPPING should be a dict, not %.200s",
                      Py_TYPE(st->name_mapping_2to3)->tp_name);
@@ -335,7 +335,7 @@ _Pickle_InitState(PickleState *st)
         PyObject_GetAttrString(compat_pickle, "IMPORT_MAPPING");
     if (!st->import_mapping_2to3)
         goto error;
-    if (!_PyAnyDict_CheckExact(st->import_mapping_2to3)) {
+    if (!PyAnyDict_CheckExact(st->import_mapping_2to3)) {
         PyErr_Format(PyExc_RuntimeError,
                      "_compat_pickle.IMPORT_MAPPING should be a dict, "
                      "not %.200s", Py_TYPE(st->import_mapping_2to3)->tp_name);

Objects/abstract.c

@@ -208,7 +208,7 @@ PyObject_GetItem(PyObject *o, PyObject *key)
 int
 PyMapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **result)
 {
-    if (_PyAnyDict_CheckExact(obj)) {
+    if (PyAnyDict_CheckExact(obj)) {
         return PyDict_GetItemRef(obj, key, result);
     }
 
@@ -1672,7 +1672,7 @@ PyNumber_ToBase(PyObject *n, int base)
 int
 PySequence_Check(PyObject *s)
 {
-    if (_PyAnyDict_Check(s))
+    if (PyAnyDict_Check(s))
         return 0;
     return Py_TYPE(s)->tp_as_sequence &&
         Py_TYPE(s)->tp_as_sequence->sq_item != NULL;
@@ -2454,7 +2454,7 @@ PyMapping_Keys(PyObject *o)
     if (o == NULL) {
         return null_error();
     }
-    if (_PyAnyDict_CheckExact(o)) {
+    if (PyAnyDict_CheckExact(o)) {
         return PyDict_Keys(o);
     }
     return method_output_as_list(o, &_Py_ID(keys));
@@ -2466,7 +2466,7 @@ PyMapping_Items(PyObject *o)
     if (o == NULL) {
         return null_error();
     }
-    if (_PyAnyDict_CheckExact(o)) {
+    if (PyAnyDict_CheckExact(o)) {
         return PyDict_Items(o);
     }
     return method_output_as_list(o, &_Py_ID(items));
@@ -2478,7 +2478,7 @@ PyMapping_Values(PyObject *o)
     if (o == NULL) {
         return null_error();
     }
-    if (_PyAnyDict_CheckExact(o)) {
+    if (PyAnyDict_CheckExact(o)) {
         return PyDict_Values(o);
     }
     return method_output_as_list(o, &_Py_ID(values));

Objects/descrobject.c

@@ -1089,7 +1089,7 @@ static int
 mappingproxy_contains(PyObject *self, PyObject *key)
 {
     mappingproxyobject *pp = (mappingproxyobject *)self;
-    if (_PyAnyDict_CheckExact(pp->mapping))
+    if (PyAnyDict_CheckExact(pp->mapping))
         return PyDict_Contains(pp->mapping, key);
     else
         return PySequence_Contains(pp->mapping, key);