Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-07 16:02:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- patch #1600346 submitted by Tomer Filiba

Browse source 
- Renamed nb_nonzero slots to nb_bool
- Renamed __nonzero__ methods to __bool__
- update core, lib, docs, and tests to match
This commit is contained in:
Jack Diederich 2006-11-28 19:15:13 +00:00
parent dfc9d4f7aa
commit 4dafcc4ece
31 changed files with 118 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/_ctypes/_ctypes.c
View file

@ -4017,7 +4017,7 @@ static PyMethodDef Simple_methods[] = {
{ NULL, NULL },
};
static int Simple_nonzero(CDataObject *self)
static int Simple_bool(CDataObject *self)
{
return memcmp(self->b_ptr, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", self->b_size);
}
@ -4032,7 +4032,7 @@ static PyNumberMethods Simple_as_number = {
0, /* nb_negative */
0, /* nb_positive */
0, /* nb_absolute */
(inquiry)Simple_nonzero, /* nb_nonzero */
(inquiry)Simple_bool, /* nb_bool */
};
#if (PY_VERSION_HEX < 0x02040000)
@ -4364,7 +4364,7 @@ static PySequenceMethods Pointer_as_sequence = {
};
static int
Pointer_nonzero(CDataObject *self)
Pointer_bool(CDataObject *self)
{
return *(void **)self->b_ptr != NULL;
}
@ -4379,7 +4379,7 @@ static PyNumberMethods Pointer_as_number = {
0, /* nb_negative */
0, /* nb_positive */
0, /* nb_absolute */
(inquiry)Pointer_nonzero, /* nb_nonzero */
(inquiry)Pointer_bool, /* nb_bool */
};
PyTypeObject Pointer_Type = {

12
Modules/datetimemodule.c
View file

@ -1958,7 +1958,7 @@ delta_new(PyTypeObject *type, PyObject *args, PyObject *kw)
}
static int
delta_nonzero(PyDateTime_Delta *self)
delta_bool(PyDateTime_Delta *self)
{
return (GET_TD_DAYS(self) != 0
|| GET_TD_SECONDS(self) != 0
@ -2083,7 +2083,7 @@ static PyNumberMethods delta_as_number = {
(unaryfunc)delta_negative, /* nb_negative */
(unaryfunc)delta_positive, /* nb_positive */
(unaryfunc)delta_abs, /* nb_absolute */
(inquiry)delta_nonzero, /* nb_nonzero */
(inquiry)delta_bool, /* nb_bool */
0, /*nb_invert*/
0, /*nb_lshift*/
0, /*nb_rshift*/
@ -2653,7 +2653,7 @@ static PyNumberMethods date_as_number = {
0, /* nb_negative */
0, /* nb_positive */
0, /* nb_absolute */
0, /* nb_nonzero */
0, /* nb_bool */
};
static PyTypeObject PyDateTime_DateType = {
@ -3324,7 +3324,7 @@ time_replace(PyDateTime_Time *self, PyObject *args, PyObject *kw)
}
static int
time_nonzero(PyDateTime_Time *self)
time_bool(PyDateTime_Time *self)
{
int offset;
int none;
@ -3418,7 +3418,7 @@ static PyNumberMethods time_as_number = {
0, /* nb_negative */
0, /* nb_positive */
0, /* nb_absolute */
(inquiry)time_nonzero, /* nb_nonzero */
(inquiry)time_bool, /* nb_bool */
};
static PyTypeObject PyDateTime_TimeType = {
@ -4501,7 +4501,7 @@ static PyNumberMethods datetime_as_number = {
0, /* nb_negative */
0, /* nb_positive */
0, /* nb_absolute */
0, /* nb_nonzero */
0, /* nb_bool */
};
static PyTypeObject PyDateTime_DateTimeType = {