diff options
| author | Stefan Krah <skrah@bytereef.org> | 2016-06-20 12:13:12 (GMT) |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2016-06-20 12:13:12 (GMT) |
| commit | 1d245fabaf975e187fa25689bfd8fccf7b5dbfdc (patch) | |
| tree | 758a26191d1a9bbf1c5e32996e3e57dc889eacc3 /Modules/_decimal | |
| parent | 8113f490c5aa29dbd28af7a47cb70ca470536bed (diff) | |
| parent | 947f099d99f52badb14837066463c44b63476cfd (diff) | |
| download | cpython-1d245fabaf975e187fa25689bfd8fccf7b5dbfdc.zip cpython-1d245fabaf975e187fa25689bfd8fccf7b5dbfdc.tar.gz cpython-1d245fabaf975e187fa25689bfd8fccf7b5dbfdc.tar.bz2 | |
Merge 3.5.
Diffstat (limited to 'Modules/_decimal')
| -rw-r--r-- | Modules/_decimal/_decimal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c index bcc31e5..dd33f97 100644 --- a/Modules/_decimal/_decimal.c +++ b/Modules/_decimal/_decimal.c @@ -2636,7 +2636,7 @@ dec_from_float(PyObject *type, PyObject *pyfloat) CURRENT_CONTEXT(context); result = PyDecType_FromFloatExact(&PyDec_Type, pyfloat, context); - if (!PyDec_CheckExact(type) && result != NULL) { + if (type != (PyObject *)&PyDec_Type && result != NULL) { Py_SETREF(result, PyObject_CallFunctionObjArgs(type, result, NULL)); } |