diff -r 46f8188f8646 Objects/typeobject.c
--- a/Objects/typeobject.c	Fri Jan 27 13:05:09 2017 +0000
+++ b/Objects/typeobject.c	Sat Jan 28 14:01:18 2017 +0900
@@ -4536,12 +4536,13 @@
 {
     PyObject *dict = type->tp_dict;
 
     for (; meth->ml_name != NULL; meth++) {
         PyObject *descr;
         int err;
+        int isdescr = 1;
         if (PyDict_GetItemString(dict, meth->ml_name) &&
             !(meth->ml_flags & METH_COEXIST))
                 continue;
         if (meth->ml_flags & METH_CLASS) {
             if (meth->ml_flags & METH_STATIC) {
                 PyErr_SetString(PyExc_ValueError,
@@ -4552,20 +4553,26 @@
         }
         else if (meth->ml_flags & METH_STATIC) {
           PyObject *cfunc = PyCFunction_NewEx(meth, (PyObject*)type, NULL);
             if (cfunc == NULL)
                 return -1;
             descr = PyStaticMethod_New(cfunc);
+            isdescr = 0;  // PyStaticMethod is not PyDescrObject
             Py_DECREF(cfunc);
         }
         else {
             descr = PyDescr_NewMethod(type, meth);
         }
         if (descr == NULL)
             return -1;
-        err = PyDict_SetItemString(dict, meth->ml_name, descr);
+        if (isdescr) {
+            err = PyDict_SetItem(dict, PyDescr_NAME(descr), descr);
+        }
+        else {
+            err = PyDict_SetItemString(dict, meth->ml_name, descr);
+        }
         Py_DECREF(descr);
         if (err < 0)
             return -1;
     }
     return 0;
 }
@@ -4579,13 +4586,13 @@
         PyObject *descr;
         if (PyDict_GetItemString(dict, memb->name))
             continue;
         descr = PyDescr_NewMember(type, memb);
         if (descr == NULL)
             return -1;
-        if (PyDict_SetItemString(dict, memb->name, descr) < 0) {
+        if (PyDict_SetItem(dict, PyDescr_NAME(descr), descr) < 0) {
             Py_DECREF(descr);
             return -1;
         }
         Py_DECREF(descr);
     }
     return 0;
@@ -4601,13 +4608,13 @@
         if (PyDict_GetItemString(dict, gsp->name))
             continue;
         descr = PyDescr_NewGetSet(type, gsp);
 
         if (descr == NULL)
             return -1;
-        if (PyDict_SetItemString(dict, gsp->name, descr) < 0) {
+        if (PyDict_SetItem(dict, PyDescr_NAME(descr), descr) < 0) {
             Py_DECREF(descr);
             return -1;
         }
         Py_DECREF(descr);
     }
     return 0;