traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-38376: Fix _PyUnicode_CheckConsistency() definition (GH-16623) 

Always define _PyUnicode_CheckConsistency() in the CPython C API.
This commit is contained in:
Victor Stinner 2019-10-07 21:12:05 +02:00 committed by GitHub
parent 13915a3100
commit 435b2eeb7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/cpython/unicodeobject.h
View File

@ -246,6 +246,10 @@ typedef struct {
} data; /* Canonical, smallest-form Unicode buffer */ } data; /* Canonical, smallest-form Unicode buffer */
} PyUnicodeObject; } PyUnicodeObject;
PyAPI_FUNC(int) _PyUnicode_CheckConsistency(
PyObject *op,
int check_content);
/* Fast access macros */ /* Fast access macros */
#define PyUnicode_WSTR_LENGTH(op) \ #define PyUnicode_WSTR_LENGTH(op) \
(PyUnicode_IS_COMPACT_ASCII(op) ? \ (PyUnicode_IS_COMPACT_ASCII(op) ? \

1
Include/internal/pycore_object.h
View File

@ -11,7 +11,6 @@ extern "C" {
#include "pycore_pystate.h" /* _PyRuntime */ #include "pycore_pystate.h" /* _PyRuntime */
PyAPI_FUNC(int) _PyType_CheckConsistency(PyTypeObject *type); 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); PyAPI_FUNC(int) _PyDict_CheckConsistency(PyObject *mp, int check_content);
/* Tell the GC to track this object. /* Tell the GC to track this object.

10
Include/unicodeobject.h
View File

@ -1032,16 +1032,6 @@ PyAPI_FUNC(int) PyUnicode_IsIdentifier(PyObject *s);
/* === Characters Type APIs =============================================== */ /* === 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 #ifndef Py_LIMITED_API
# define Py_CPYTHON_UNICODEOBJECT_H # define Py_CPYTHON_UNICODEOBJECT_H
# include "cpython/unicodeobject.h" # include "cpython/unicodeobject.h"