diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-01-15 19:32:23 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-01-15 19:32:23 (GMT) |
| commit | cce2f217d403dff7344fcc1c381e36dfd075a961 (patch) | |
| tree | 87189334129e9ca408a823ea98d3b1dd512addd3 /Objects | |
| parent | 29500f64b609e312e72150f0539c4508d650656b (diff) | |
| download | cpython-cce2f217d403dff7344fcc1c381e36dfd075a961.zip cpython-cce2f217d403dff7344fcc1c381e36dfd075a961.tar.gz cpython-cce2f217d403dff7344fcc1c381e36dfd075a961.tar.bz2 | |
Issue 4910, patch 2 of (probably) 3: pave the way for renaming of
nb_long: remove last remaining use of nb_long
(in the struct module) from the core, set nb_long slots on all builtin
and extension types to 0, and remove uses of __long__ in test_complex
and test_binop.
Reviewed by Benjamin Peterson.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/complexobject.c | 10 | ||||
| -rw-r--r-- | Objects/floatobject.c | 2 | ||||
| -rw-r--r-- | Objects/longobject.c | 2 | ||||
| -rw-r--r-- | Objects/weakrefobject.c | 3 |
4 files changed, 4 insertions, 13 deletions
diff --git a/Objects/complexobject.c b/Objects/complexobject.c index 75283a0..a7fd7dc 100644 --- a/Objects/complexobject.c +++ b/Objects/complexobject.c @@ -661,14 +661,6 @@ complex_int(PyObject *v) } static PyObject * -complex_long(PyObject *v) -{ - PyErr_SetString(PyExc_TypeError, - "can't convert complex to long; use long(abs(z))"); - return NULL; -} - -static PyObject * complex_float(PyObject *v) { PyErr_SetString(PyExc_TypeError, @@ -1068,7 +1060,7 @@ static PyNumberMethods complex_as_number = { 0, /* nb_xor */ 0, /* nb_or */ complex_int, /* nb_int */ - complex_long, /* nb_long */ + 0, /* nb_long */ complex_float, /* nb_float */ 0, /* nb_inplace_add */ 0, /* nb_inplace_subtract */ diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 20c1eef..7292ca5 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -1798,7 +1798,7 @@ static PyNumberMethods float_as_number = { 0, /*nb_xor*/ 0, /*nb_or*/ float_trunc, /*nb_int*/ - float_trunc, /*nb_long*/ + 0, /*nb_long*/ float_float, /*nb_float*/ 0, /* nb_inplace_add */ 0, /* nb_inplace_subtract */ diff --git a/Objects/longobject.c b/Objects/longobject.c index 9993d10..259f7c5 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -3830,7 +3830,7 @@ static PyNumberMethods long_as_number = { long_xor, /*nb_xor*/ long_or, /*nb_or*/ long_long, /*nb_int*/ - long_long, /*nb_long*/ + 0, /*nb_long*/ long_float, /*nb_float*/ 0, /* nb_inplace_add */ 0, /* nb_inplace_subtract */ diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index faa0f86..538b21c 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -489,7 +489,6 @@ WRAP_BINARY(proxy_and, PyNumber_And) WRAP_BINARY(proxy_xor, PyNumber_Xor) WRAP_BINARY(proxy_or, PyNumber_Or) WRAP_UNARY(proxy_int, PyNumber_Int) -WRAP_UNARY(proxy_long, PyNumber_Long) WRAP_UNARY(proxy_float, PyNumber_Float) WRAP_BINARY(proxy_iadd, PyNumber_InPlaceAdd) WRAP_BINARY(proxy_isub, PyNumber_InPlaceSubtract) @@ -595,7 +594,7 @@ static PyNumberMethods proxy_as_number = { proxy_xor, /*nb_xor*/ proxy_or, /*nb_or*/ proxy_int, /*nb_int*/ - proxy_long, /*nb_long*/ + 0, /*nb_long*/ proxy_float, /*nb_float*/ proxy_iadd, /*nb_inplace_add*/ proxy_isub, /*nb_inplace_subtract*/ |