diff options
| author | Victor Stinner <vstinner@python.org> | 2019-10-07 21:12:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 21:12:05 +0200 |
| commit | 435b2eeb7bc5b8ec264e900b38bcb3d76552d777 (patch) | |
| tree | 0be348436bd2a06c7e83523a55cfcfd8c412a2fe | |
| parent | 13915a3100608f011b29da2f3716c990f523b631 (diff) | |
| download | cpython-git-435b2eeb7bc5b8ec264e900b38bcb3d76552d777.tar.gz | |
bpo-38376: Fix _PyUnicode_CheckConsistency() definition (GH-16623)
Always define _PyUnicode_CheckConsistency() in the CPython C API.
| -rw-r--r-- | Include/cpython/unicodeobject.h | 4 | ||||
| -rw-r--r-- | Include/internal/pycore_object.h | 1 | ||||
| -rw-r--r-- | Include/unicodeobject.h | 10 |
3 files changed, 4 insertions, 11 deletions
diff --git a/Include/cpython/unicodeobject.h b/Include/cpython/unicodeobject.h index c11503d339..54a13e32ba 100644 --- a/Include/cpython/unicodeobject.h +++ b/Include/cpython/unicodeobject.h @@ -246,6 +246,10 @@ typedef struct { } data; /* Canonical, smallest-form Unicode buffer */ } PyUnicodeObject; +PyAPI_FUNC(int) _PyUnicode_CheckConsistency( + PyObject *op, + int check_content); + /* Fast access macros */ #define PyUnicode_WSTR_LENGTH(op) \ (PyUnicode_IS_COMPACT_ASCII(op) ? \ diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h index 81548f8191..7418c6936b 100644 --- a/Include/internal/pycore_object.h +++ b/Include/internal/pycore_object.h @@ -11,7 +11,6 @@ extern "C" { #include "pycore_pystate.h" /* _PyRuntime */ PyAPI_FUNC(int) _PyType_CheckConsistency(PyTypeObject *type); -PyAPI_FUNC(int) _PyUnicode_CheckConsistency(PyObject *op, int check_content); PyAPI_FUNC(int) _PyDict_CheckConsistency(PyObject *mp, int check_content); /* Tell the GC to track this object. diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 6d141b37bf..97d8cd12f6 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -1032,16 +1032,6 @@ PyAPI_FUNC(int) PyUnicode_IsIdentifier(PyObject *s); /* === Characters Type APIs =============================================== */ -#if defined(Py_DEBUG) && !defined(Py_LIMITED_API) -PyAPI_FUNC(int) _PyUnicode_CheckConsistency( - PyObject *op, - int check_content); -#elif !defined(NDEBUG) -/* For asserts that call _PyUnicode_CheckConsistency(), which would - * otherwise be a problem when building with asserts but without Py_DEBUG. */ -#define _PyUnicode_CheckConsistency(op, check_content) PyUnicode_Check(op) -#endif - #ifndef Py_LIMITED_API # define Py_CPYTHON_UNICODEOBJECT_H # include "cpython/unicodeobject.h" |