Skip to content

bpo-36048: Use __index__() instead of __int__() for implicit conversion if available. #11952

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
serhiy-storchaka merged 5 commits into from
Feb 25, 2019
Merged

bpo-36048: Use __index__() instead of __int__() for implicit conversion if available. #11952

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9435aab
bpo-36048: Use __index__() instead of __int__() for implicit conversi…
serhiy-storchaka Feb 20, 2019
6f2a051
Address review comments.
serhiy-storchaka Feb 20, 2019
b0aa18d
Make PyNumber_Check() returning 1 for index integers.
serhiy-storchaka Feb 22, 2019
44b5acd
Use nb_index for the result of __trunc__.
serhiy-storchaka Feb 24, 2019
fbecff8
Extend the warning message.
serhiy-storchaka Feb 25, 2019
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
Prev Previous commit
Next Next commit
Use nb_index for the result of __trunc__.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Feb 24, 2019
commit 44b5acd5558d8ddd4c8c862688c48e7ce2016b48
3 changes: 2 additions & 1 deletion Lib/test/test_int.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,8 @@ def __int__(self):
class TruncReturnsNonInt(base):
def __trunc__(self):
return Integral()
self.assertEqual(int(TruncReturnsNonInt()), 42)
with self.assertWarns(DeprecationWarning):
self.assertEqual(int(TruncReturnsNonInt()), 42)

class NonIntegral(trunc_result_base):
def __trunc__(self):
Expand Down
4 changes: 2 additions & 2 deletions Objects/abstract.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,15 +1387,15 @@ PyNumber_Long(PyObject *o)
/* __trunc__ is specified to return an Integral type,
but int() needs to return an int. */
m = result->ob_type->tp_as_number;
if (m == NULL || m->nb_int == NULL) {
if (m == NULL || (m->nb_index == NULL && m->nb_int == NULL)) {
PyErr_Format(
PyExc_TypeError,
"__trunc__ returned non-Integral (type %.200s)",
result->ob_type->tp_name);
Py_DECREF(result);
return NULL;
}
Py_SETREF(result, _PyLong_FromNbInt(result));
Py_SETREF(result, _PyLong_FromNbIndexOrNbInt(result));
if (result != NULL && !PyLong_CheckExact(result)) {
Py_SETREF(result, _PyLong_Copy((PyLongObject *)result));
}
Expand Down