From f1d002c1e094922b0f17a820f90ff102d68ab253 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 21 Nov 2018 23:53:44 +0100 Subject: bpo-35059: Enhance _PyObject_AssertFailed() (GH-10642) Enhance _PyObject_AssertFailed() * Exchange 'expr' and 'msg' parameters * 'expr' and 'func' arguments can now be NULL --- Include/object.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Include/object.h') diff --git a/Include/object.h b/Include/object.h index 48ce9d2b97..0d84d3604f 100644 --- a/Include/object.h +++ b/Include/object.h @@ -1158,8 +1158,8 @@ _PyObject_DebugTypeStats(FILE *out); ((expr) \ ? (void)(0) \ : _PyObject_AssertFailed((obj), \ - (msg), \ Py_STRINGIFY(expr), \ + (msg), \ __FILE__, \ __LINE__, \ __func__)) @@ -1169,11 +1169,13 @@ _PyObject_DebugTypeStats(FILE *out); /* Declare and define _PyObject_AssertFailed() even when NDEBUG is defined, to avoid causing compiler/linker errors when building extensions without - NDEBUG against a Python built with NDEBUG defined. */ + NDEBUG against a Python built with NDEBUG defined. + + msg, expr and function can be NULL. */ PyAPI_FUNC(void) _PyObject_AssertFailed( PyObject *obj, - const char *msg, const char *expr, + const char *msg, const char *file, int line, const char *function); -- cgit v1.2.1