Skip to content

Commit 94011b3

Browse files
authored
Merge branch 'main' into shutdown-workers-transiency
2 parents 89c355a + bbf1979 commit 94011b3

File tree

24 files changed

+585
-456
lines changed

24 files changed

+585
-456
lines changed

Include/cpython/unicodeobject.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,22 +212,21 @@ static inline unsigned int PyUnicode_IS_READY(PyObject* Py_UNUSED(op)) {
212212
#define PyUnicode_IS_READY(op) PyUnicode_IS_READY(_PyObject_CAST(op))
213213

214214
/* Return true if the string contains only ASCII characters, or 0 if not. The
215-
string may be compact (PyUnicode_IS_COMPACT_ASCII) or not, but must be
216-
ready. */
215+
string may be compact (PyUnicode_IS_COMPACT_ASCII) or not. */
217216
static inline unsigned int PyUnicode_IS_ASCII(PyObject *op) {
218217
return _PyASCIIObject_CAST(op)->state.ascii;
219218
}
220219
#define PyUnicode_IS_ASCII(op) PyUnicode_IS_ASCII(_PyObject_CAST(op))
221220

222221
/* Return true if the string is compact or 0 if not.
223-
No type checks or Ready calls are performed. */
222+
No type checks are performed. */
224223
static inline unsigned int PyUnicode_IS_COMPACT(PyObject *op) {
225224
return _PyASCIIObject_CAST(op)->state.compact;
226225
}
227226
#define PyUnicode_IS_COMPACT(op) PyUnicode_IS_COMPACT(_PyObject_CAST(op))
228227

229228
/* Return true if the string is a compact ASCII string (use PyASCIIObject
230-
structure), or 0 if not. No type checks or Ready calls are performed. */
229+
structure), or 0 if not. No type checks are performed. */
231230
static inline int PyUnicode_IS_COMPACT_ASCII(PyObject *op) {
232231
return (_PyASCIIObject_CAST(op)->state.ascii && PyUnicode_IS_COMPACT(op));
233232
}
@@ -319,7 +318,7 @@ static inline void PyUnicode_WRITE(int kind, void *data,
319318
(index), _Py_STATIC_CAST(Py_UCS4, value))
320319

321320
/* Read a code point from the string's canonical representation. No checks
322-
or ready calls are performed. */
321+
are performed. */
323322
static inline Py_UCS4 PyUnicode_READ(int kind,
324323
const void *data, Py_ssize_t index)
325324
{

Include/internal/pycore_traceback.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ extern const char* _Py_DumpTracebackThreads(
6666
/* Write a Unicode object into the file descriptor fd. Encode the string to
6767
ASCII using the backslashreplace error handler.
6868
69-
Do nothing if text is not a Unicode object. The function accepts Unicode
70-
string which is not ready (PyUnicode_WCHAR_KIND).
69+
Do nothing if text is not a Unicode object.
7170
7271
This function is signal safe. */
7372
extern void _Py_DumpASCII(int fd, PyObject *text);

0 commit comments

Comments
 (0)