diff options
| author | Jack Diederich <jackdied@gmail.com> | 2006-11-28 19:15:13 (GMT) |
|---|---|---|
| committer | Jack Diederich <jackdied@gmail.com> | 2006-11-28 19:15:13 (GMT) |
| commit | 4dafcc4ece09c2a60473bb109513de4e7d2c2b11 (patch) | |
| tree | 32be8af9dd16e1ea407bf008c92d62f7cd7539bd /Objects/object.c | |
| parent | dfc9d4f7aa38a3961847c034532e39f05a569f54 (diff) | |
| download | cpython-4dafcc4ece09c2a60473bb109513de4e7d2c2b11.zip cpython-4dafcc4ece09c2a60473bb109513de4e7d2c2b11.tar.gz cpython-4dafcc4ece09c2a60473bb109513de4e7d2c2b11.tar.bz2 | |
- patch #1600346 submitted by Tomer Filiba
- Renamed nb_nonzero slots to nb_bool
- Renamed __nonzero__ methods to __bool__
- update core, lib, docs, and tests to match
Diffstat (limited to 'Objects/object.c')
| -rw-r--r-- | Objects/object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/object.c b/Objects/object.c index e202e9b..4d9f414 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1246,8 +1246,8 @@ PyObject_IsTrue(PyObject *v) if (v == Py_None) return 0; else if (v->ob_type->tp_as_number != NULL && - v->ob_type->tp_as_number->nb_nonzero != NULL) - res = (*v->ob_type->tp_as_number->nb_nonzero)(v); + v->ob_type->tp_as_number->nb_bool != NULL) + res = (*v->ob_type->tp_as_number->nb_bool)(v); else if (v->ob_type->tp_as_mapping != NULL && v->ob_type->tp_as_mapping->mp_length != NULL) res = (*v->ob_type->tp_as_mapping->mp_length)(v); |