diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-11-14 17:08:31 (GMT) |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-11-14 17:08:31 (GMT) |
| commit | d20fb8219554989f3ed901c144014d2f4c5a300a (patch) | |
| tree | 8cdc39318d3ce7f8bf6fa16ab73795eceae238e5 /Objects | |
| parent | 2eb2f5e3597499b0c72b50bb5ed26da0e1cb65b9 (diff) | |
| download | cpython-d20fb8219554989f3ed901c144014d2f4c5a300a.zip cpython-d20fb8219554989f3ed901c144014d2f4c5a300a.tar.gz cpython-d20fb8219554989f3ed901c144014d2f4c5a300a.tar.bz2 | |
Issue #16290: __complex__ must now always return an instance of complex.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/complexobject.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Objects/complexobject.c b/Objects/complexobject.c index 403c60c..355b063 100644 --- a/Objects/complexobject.c +++ b/Objects/complexobject.c @@ -271,6 +271,12 @@ try_complex_special_method(PyObject *op) { if (f) { PyObject *res = PyObject_CallFunctionObjArgs(f, NULL); Py_DECREF(f); + if (res != NULL && !PyComplex_Check(res)) { + PyErr_SetString(PyExc_TypeError, + "__complex__ should return a complex object"); + Py_DECREF(res); + return NULL; + } return res; } return NULL; @@ -296,12 +302,6 @@ PyComplex_AsCComplex(PyObject *op) newop = try_complex_special_method(op); if (newop) { - if (!PyComplex_Check(newop)) { - PyErr_SetString(PyExc_TypeError, - "__complex__ should return a complex object"); - Py_DECREF(newop); - return cv; - } cv = ((PyComplexObject *)newop)->cval; Py_DECREF(newop); return cv; |