diff options
| author | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2007-09-21 20:19:23 +0000 |
|---|---|---|
| committer | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2007-09-21 20:19:23 +0000 |
| commit | 16c7075164abe85f7cf750d6b63ee2b5ddaa2f54 (patch) | |
| tree | fffa0bfcdd832cc4d5cb323748b74c13796344e6 /Objects | |
| parent | 8ce81f767a48e9e645c523137c7f83e49f79f986 (diff) | |
| download | cpython-git-16c7075164abe85f7cf750d6b63ee2b5ddaa2f54.tar.gz | |
Remove more cruft leftover from nb_coerce. Rename nb_coerce to
nb_reserved.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/boolobject.c | 2 | ||||
| -rw-r--r-- | Objects/complexobject.c | 2 | ||||
| -rw-r--r-- | Objects/floatobject.c | 5 | ||||
| -rw-r--r-- | Objects/longobject.c | 2 | ||||
| -rw-r--r-- | Objects/setobject.c | 2 | ||||
| -rw-r--r-- | Objects/weakrefobject.c | 2 |
6 files changed, 7 insertions, 8 deletions
diff --git a/Objects/boolobject.c b/Objects/boolobject.c index 3674086fb6..dfea7f44ac 100644 --- a/Objects/boolobject.c +++ b/Objects/boolobject.c @@ -108,7 +108,7 @@ static PyNumberMethods bool_as_number = { bool_and, /* nb_and */ bool_xor, /* nb_xor */ bool_or, /* nb_or */ - 0, /* nb_coerce */ + 0, /* nb_reserved */ 0, /* nb_int */ 0, /* nb_long */ 0, /* nb_float */ diff --git a/Objects/complexobject.c b/Objects/complexobject.c index fa493d76e8..a22f22f3a3 100644 --- a/Objects/complexobject.c +++ b/Objects/complexobject.c @@ -963,7 +963,7 @@ static PyNumberMethods complex_as_number = { 0, /* nb_and */ 0, /* nb_xor */ 0, /* nb_or */ - (coercion)0, /* nb_coerce */ + 0, /* nb_reserved */ complex_int, /* nb_int */ complex_long, /* nb_long */ complex_float, /* nb_float */ diff --git a/Objects/floatobject.c b/Objects/floatobject.c index eb540e691a..3ef44f6395 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -235,8 +235,7 @@ format_float(char *buf, size_t buflen, PyFloatObject *v, int precision) } /* Macro and helper that convert PyObject obj to a C double and store - the value in dbl; this replaces the functionality of the coercion - slot function. If conversion to double raises an exception, obj is + the value in dbl. If conversion to double raises an exception, obj is set to NULL, and the function invoking this macro returns NULL. If obj is not of float, int or long type, Py_NotImplemented is incref'ed, stored in obj, and returned from the function invoking this macro. @@ -1069,7 +1068,7 @@ static PyNumberMethods float_as_number = { 0, /*nb_and*/ 0, /*nb_xor*/ 0, /*nb_or*/ - (coercion)0, /*nb_coerce*/ + 0, /*nb_reserved*/ float_trunc, /*nb_int*/ float_trunc, /*nb_long*/ float_float, /*nb_float*/ diff --git a/Objects/longobject.c b/Objects/longobject.c index 7f09bb66ba..8ebc31cd94 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -3631,7 +3631,7 @@ static PyNumberMethods long_as_number = { long_and, /*nb_and*/ long_xor, /*nb_xor*/ long_or, /*nb_or*/ - 0, /*nb_coerce*/ + 0, /*nb_reserved*/ long_long, /*nb_int*/ long_long, /*nb_long*/ long_float, /*nb_float*/ diff --git a/Objects/setobject.c b/Objects/setobject.c index 079f404db8..ba7d2c4763 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -1881,7 +1881,7 @@ static PyNumberMethods set_as_number = { (binaryfunc)set_and, /*nb_and*/ (binaryfunc)set_xor, /*nb_xor*/ (binaryfunc)set_or, /*nb_or*/ - 0, /*nb_coerce*/ + 0, /*nb_reserved*/ 0, /*nb_int*/ 0, /*nb_long*/ 0, /*nb_float*/ diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index c3d3ff092d..0aa470386c 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -589,7 +589,7 @@ static PyNumberMethods proxy_as_number = { proxy_and, /*nb_and*/ proxy_xor, /*nb_xor*/ proxy_or, /*nb_or*/ - 0, /*nb_coerce*/ + 0, /*nb_reserved*/ proxy_int, /*nb_int*/ proxy_long, /*nb_long*/ proxy_float, /*nb_float*/ |