Merge 3.5.

pablogsal · Jun 20, 2016 · 1d245fa · 1d245fa
2 parents 8113f49 + 947f099
commit 1d245fa
Showing 1 changed file with 1 addition and 1 deletion.
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));
     }