Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
36 changes: 36 additions & 0 deletions Doc/c-api/long.rst
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,42 @@ distinguished from a number. Use :c:func:`PyErr_Occurred` to disambiguate.
.. versionadded:: 3.14


.. c:function:: int PyLong_IsPositive(PyObject *obj)

Check if the integer object *obj* is strictly positive.

On success, return ``1`` if *obj* is positive, and ``0`` otherwise.

On failure, return ``-1`` with an exception set. This function always succeeds
if *obj* is a :c:type:`PyLongObject` or its subtype.

.. versionadded:: next


.. c:function:: int PyLong_IsNegative(PyObject *obj)

Check if the integer object *obj* is strictly negative.

On success, return ``1`` if *obj* is negative, and ``0`` otherwise.

On failure, return ``-1`` with an exception set. This function always succeeds
if *obj* is a :c:type:`PyLongObject` or its subtype.

.. versionadded:: next


.. c:function:: int PyLong_IsZero(PyObject *obj)

Check if the integer object *obj* is zero.

On success, return ``1`` if *obj* is zero, and ``0`` if it is non-zero.

On failure, return ``-1`` with an exception set. This function always succeeds
if *obj* is a :c:type:`PyLongObject` or its subtype.

.. versionadded:: next


.. c:function:: PyObject* PyLong_GetInfo(void)

On success, return a read only :term:`named tuple`, that holds
Expand Down
5 changes: 5 additions & 0 deletions Doc/whatsnew/3.14.rst
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,11 @@ New Features
an interned string and deallocate it during module shutdown.
(Contribued by Eddie Elizondo in :gh:`113601`.)

* Add :c:func:`PyLong_IsPositive`, :c:func:`PyLong_IsNegative`
and :c:func:`PyLong_IsZero` for checking if :c:type:`PyLongObject`
is positive, negative, or zero.
(Contribued by James Roy and Sergey B Kirpichev in :gh:`126061`.)

* Add new functions to convert C ``<stdint.h>`` numbers from/to Python
:class:`int`:

Expand Down
18 changes: 18 additions & 0 deletions Include/cpython/longobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,24 @@ PyAPI_FUNC(PyObject*) PyLong_FromUnsignedNativeBytes(const void* buffer,
PyAPI_FUNC(int) PyUnstable_Long_IsCompact(const PyLongObject* op);
PyAPI_FUNC(Py_ssize_t) PyUnstable_Long_CompactValue(const PyLongObject* op);

/* PyLong_IsPositive. Check if the integer object is positive.

- On success, return 1 if *obj is positive, and 0 otherwise.
- On failure, set an exception, and return -1. */
PyAPI_FUNC(int) PyLong_IsPositive(PyObject *obj);

/* PyLong_IsNegative. Check if the integer object is negative.

- On success, return 1 if *obj is negative, and 0 otherwise.
- On failure, set an exception, and return -1. */
PyAPI_FUNC(int) PyLong_IsNegative(PyObject *obj);

/* PyLong_IsZero. Check if the integer object is zero.

- On success, return 1 if *obj is zero, and 0 if it is non-zero.
- On failure, set an exception, and return -1. */
PyAPI_FUNC(int) PyLong_IsZero(PyObject *obj);

/* PyLong_GetSign. Get the sign of an integer object:
0, -1 or +1 for zero, negative or positive integer, respectively.

Expand Down
45 changes: 45 additions & 0 deletions Lib/test/test_capi/test_long.py
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,51 @@ def test_long_getsign(self):

# CRASHES getsign(NULL)

def test_long_ispositive(self):
# Test PyLong_IsPositive()
ispositive = _testcapi.pylong_ispositive
self.assertEqual(ispositive(1), 1)
self.assertEqual(ispositive(123), 1)
self.assertEqual(ispositive(-1), 0)
self.assertEqual(ispositive(0), 0)
self.assertEqual(ispositive(True), 1)
self.assertEqual(ispositive(False), 0)
self.assertEqual(ispositive(IntSubclass(-1)), 0)
self.assertRaises(TypeError, ispositive, 1.0)
self.assertRaises(TypeError, ispositive, Index(123))

# CRACHES ispositive(NULL)

def test_long_isnegative(self):
# Test PyLong_IsNegative()
isnegative = _testcapi.pylong_isnegative
self.assertEqual(isnegative(1), 0)
self.assertEqual(isnegative(123), 0)
self.assertEqual(isnegative(-1), 1)
self.assertEqual(isnegative(0), 0)
self.assertEqual(isnegative(True), 0)
self.assertEqual(isnegative(False), 0)
self.assertEqual(isnegative(IntSubclass(-1)), 1)
self.assertRaises(TypeError, isnegative, 1.0)
self.assertRaises(TypeError, isnegative, Index(123))

# CRACHES isnegative(NULL)

def test_long_iszero(self):
# Test PyLong_IsZero()
iszero = _testcapi.pylong_iszero
self.assertEqual(iszero(1), 0)
self.assertEqual(iszero(-1), 0)
self.assertEqual(iszero(0), 1)
self.assertEqual(iszero(True), 0)
self.assertEqual(iszero(False), 1)
self.assertEqual(iszero(IntSubclass(-1)), 0)
self.assertEqual(iszero(IntSubclass(0)), 1)
self.assertRaises(TypeError, iszero, 1.0)
self.assertRaises(TypeError, iszero, Index(123))

# CRACHES iszero(NULL)

def test_long_asint32(self):
# Test PyLong_AsInt32() and PyLong_FromInt32()
to_int32 = _testlimitedcapi.pylong_asint32
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Add :c:func:`PyLong_IsPositive`, :c:func:`PyLong_IsNegative`
and :c:func:`PyLong_IsZero` for checking if :c:type:`PyLongObject`
is positive, negative, or zero.
24 changes: 24 additions & 0 deletions Modules/_testcapi/long.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,27 @@ pylong_getsign(PyObject *module, PyObject *arg)
}


static PyObject *
pylong_ispositive(PyObject *module, PyObject *arg)
{
RETURN_INT(PyLong_IsPositive(arg));
}


static PyObject *
pylong_isnegative(PyObject *module, PyObject *arg)
{
RETURN_INT(PyLong_IsNegative(arg));
}


static PyObject *
pylong_iszero(PyObject *module, PyObject *arg)
{
RETURN_INT(PyLong_IsZero(arg));
}


static PyObject *
pylong_aspid(PyObject *module, PyObject *arg)
{
Expand All @@ -124,6 +145,9 @@ static PyMethodDef test_methods[] = {
{"pylong_fromnativebytes", pylong_fromnativebytes, METH_VARARGS},
{"pylong_getsign", pylong_getsign, METH_O},
{"pylong_aspid", pylong_aspid, METH_O},
{"pylong_ispositive", pylong_ispositive, METH_O},
{"pylong_isnegative", pylong_isnegative, METH_O},
{"pylong_iszero", pylong_iszero, METH_O},
{NULL},
};

Expand Down
30 changes: 30 additions & 0 deletions Objects/longobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,36 @@ PyLong_AsUnsignedLongMask(PyObject *op)
return val;
}

int
PyLong_IsPositive(PyObject *obj)
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{
{
if (obj == NULL) {
PyErr_BadInternalCall();
return -1;
}

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

int
PyLong_IsNegative(PyObject *obj)
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{
{
if (obj == NULL) {
PyErr_BadInternalCall();
return -1;
}

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

int
PyLong_IsZero(PyObject *obj)
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{
{
if (obj == NULL) {
PyErr_BadInternalCall();
return -1;
}

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

int
_PyLong_Sign(PyObject *vv)
{
Expand Down
Loading