Skip to content

Use PYTHONCAPI_COMPAT_EXPECT_TYPE() #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Nov 15, 2026
+11 −35
Merged

Use PYTHONCAPI_COMPAT_EXPECT_TYPE() #214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 11 additions & 35 deletions pythoncapi_compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,24 +1705,17 @@ PyUnicodeWriter_Format(PyUnicodeWriter *writer, const char *format, ...)
#if PY_VERSION_HEX < _Py_PACK_VERSION(3, 14) || defined(Py_LIMITED_API)
static inline int PyLong_GetSign(PyObject *obj, int *sign)
{
#ifndef Py_LIMITED_API
if (!PyLong_Check(obj)) {
PYTHONCAPI_COMPAT_EXPECT_TYPE("expect int, got ", obj);
PYTHONCAPI_COMPAT_EXPECT_TYPE("expected int, got ", obj);
return -1;
}

#ifndef Py_LIMITED_API
*sign = _PyLong_Sign(obj);
return 0;
#else
PyObject *zero = Py_GetConstant(Py_CONSTANT_ZERO);
int cmp;

if (!PyLong_Check(obj)) {
PYTHONCAPI_COMPAT_EXPECT_TYPE("expect int, got ", obj);
return -1;
}

cmp = PyObject_RichCompareBool(obj, zero, Py_GT);
int cmp = PyObject_RichCompareBool(obj, zero, Py_GT);
if (cmp > 0) {
*sign = 1;
return 0;
Expand All @@ -1749,42 +1742,31 @@ static inline int PyLong_GetSign(PyObject *obj, int *sign)
#if PY_VERSION_HEX < _Py_PACK_VERSION(3, 14) || defined(Py_LIMITED_API)
static inline int PyLong_IsPositive(PyObject *obj)
{
#ifndef Py_LIMITED_API
if (!PyLong_Check(obj)) {
PYTHONCAPI_COMPAT_EXPECT_TYPE("expected int, got ", obj);
return -1;
}

#ifndef Py_LIMITED_API
return _PyLong_Sign(obj) == 1;
#else
PyObject *zero = Py_GetConstant(Py_CONSTANT_ZERO);

if (!PyLong_Check(obj)) {
PyErr_Format(PyExc_TypeError, "expect int, got %R", obj);
return -1;
}

return PyObject_RichCompareBool(obj, zero, Py_GT);
#endif
}

static inline int PyLong_IsNegative(PyObject *obj)
{
#ifndef Py_LIMITED_API
if (!PyLong_Check(obj)) {
PYTHONCAPI_COMPAT_EXPECT_TYPE("expected int, got ", obj);
return -1;
}

#ifndef Py_LIMITED_API
return _PyLong_Sign(obj) == -1;
#else
PyObject *zero = Py_GetConstant(Py_CONSTANT_ZERO);
int cmp;

if (!PyLong_Check(obj)) {
PYTHONCAPI_COMPAT_EXPECT_TYPE("expect int, got ", obj);
return -1;
}

cmp = PyObject_RichCompareBool(obj, zero, Py_LT);
int cmp = PyObject_RichCompareBool(obj, zero, Py_LT);
if (cmp > 0) {
return 1;
}
Expand All @@ -1797,20 +1779,15 @@ static inline int PyLong_IsNegative(PyObject *obj)

static inline int PyLong_IsZero(PyObject *obj)
{
#ifndef Py_LIMITED_API
if (!PyLong_Check(obj)) {
PYTHONCAPI_COMPAT_EXPECT_TYPE("expected int, got ", obj);
return -1;
}

#ifndef Py_LIMITED_API
return _PyLong_Sign(obj) == 0;
#else
PyObject *zero = Py_GetConstant(Py_CONSTANT_ZERO);

if (!PyLong_Check(obj)) {
PYTHONCAPI_COMPAT_EXPECT_TYPE("expect int, got ", obj);
return -1;
}

return PyObject_RichCompareBool(obj, zero, Py_EQ);
#endif
}
Expand Down Expand Up @@ -1870,8 +1847,7 @@ static inline PyObject* PyBytes_Join(PyObject *sep, PyObject *iterable)
return NULL;
}
if (!PyBytes_Check(sep)) {
PyErr_Format(PyExc_TypeError,
"sep: expected bytes, got %T", sep);
PYTHONCAPI_COMPAT_EXPECT_TYPE("sep: expected bytes, got ", sep);
return NULL;
}

Expand Down
Loading