Merge 3.5.

Stefan Krah · Stefan Krah · commit 1d245fabaf97 · 2016-06-20T14:13:12.000+02:00
diff --git 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));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2636,7 +2636,7 @@ dec_from_float(PyObject type, PyObject pyfloat)`
`2636`	`2636`
`2637`	`2637`	`CURRENT_CONTEXT(context);`
`2638`	`2638`	`result = PyDecType_FromFloatExact(&PyDec_Type, pyfloat, context);`
`2639`		`- if (!PyDec_CheckExact(type) && result != NULL) {`
	`2639`	`+ if (type != (PyObject *)&PyDec_Type && result != NULL) {`
`2640`	`2640`	`Py_SETREF(result, PyObject_CallFunctionObjArgs(type, result, NULL));`
`2641`	`2641`	`}`
`2642`	`2642`