[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5.

[stefan.krah]

https://hg.python.org/cpython/rev/30b6cd2b3440
changeset:   102113:30b6cd2b3440
parent:      102111:a6e6db79009a
parent:      102112:51a7a97c3ed4
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Jun 20 14:13:12 2016 +0200
summary:
  Merge 3.5.

files:
  Modules/_decimal/_decimal.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -2636,7 +2636,7 @@
 
     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));
     }
 

-- 
Repository URL: https://hg.python.org/cpython