Merge branch 3.6 into 3.6-slp.

Author: Anselm Kruis

Misc/NEWS

@@ -10,6 +10,10 @@ What's New in Python 3.6.1 release candidate 1?
 Core and Builtins
 -----------------
 
+- bpo-29684: Fix minor regression of PyEval_CallObjectWithKeywords.
+  It should raise TypeError when kwargs is not a dict.  But it might
+  cause segv when args=NULL and kwargs is not a dict.
+
 - Issue #28598: Support __rmod__ for subclasses of str being called before
   str.__mod__.  Patch by Martijn Pieters.
 

Python/ceval.c

@@ -5203,14 +5203,7 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *args, PyObject *kwargs)
     assert(!PyErr_Occurred());
 #endif
 
-    if (args == NULL) {
-        STACKLESS_PROMOTE_ALL();
-        result = _PyObject_FastCallDict(func, NULL, 0, kwargs);
-        STACKLESS_ASSERT();
-        return result;
-    }
-
-    if (!PyTuple_Check(args)) {
+    if (args != NULL && !PyTuple_Check(args)) {
         PyErr_SetString(PyExc_TypeError,
                         "argument list must be a tuple");
         return NULL;
@@ -5223,7 +5216,12 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *args, PyObject *kwargs)
     }
 
     STACKLESS_PROMOTE_ALL();
-    result = PyObject_Call(func, args, kwargs);
+    if (args == NULL) {
+        result = _PyObject_FastCallDict(func, NULL, 0, kwargs);
+    }
+    else {
+        result = PyObject_Call(func, args, kwargs);
+    }
     STACKLESS_ASSERT();
 
     return result;