summaryrefslogtreecommitdiff
path: root/Modules/_decimal
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2016-06-20 12:10:13 +0200
committerStefan Krah <skrah@bytereef.org>2016-06-20 12:10:13 +0200
commit6817c59cf08ac214737d86f37e63a431385a9613 (patch)
treed3f91e41a3063cbcc86a99dfa7fbc8fec43841d3 /Modules/_decimal
parent2275e626b1694557f646fd8a06608074731d6c82 (diff)
downloadcpython-git-6817c59cf08ac214737d86f37e63a431385a9613.tar.gz
Issue #27006: from_float(): call the subclass' __new__() and __init__().
Diffstat (limited to 'Modules/_decimal')
-rw-r--r--Modules/_decimal/_decimal.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
index 112b44fda7..e69d715bb2 100644
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -2630,12 +2630,18 @@ PyDecType_FromSequenceExact(PyTypeObject *type, PyObject *v,
/* class method */
static PyObject *
-dec_from_float(PyObject *dec, PyObject *pyfloat)
+dec_from_float(PyObject *type, PyObject *pyfloat)
{
PyObject *context;
+ PyObject *result;
CURRENT_CONTEXT(context);
- return PyDecType_FromFloatExact((PyTypeObject *)dec, pyfloat, context);
+ result = PyDecType_FromFloatExact(&PyDec_Type, pyfloat, context);
+ if (!PyDec_CheckExact(type) && result != NULL) {
+ Py_SETREF(result, PyObject_CallFunctionObjArgs(type, result, NULL));
+ }
+
+ return result;
}
/* create_decimal_from_float */