merge 3.6

This commit is contained in:
Benjamin Peterson 2016-11-06 13:01:23 -08:00
commit 6e9d6b9536
1 changed files with 9 additions and 0 deletions

View File

@ -1598,6 +1598,15 @@ _Py_ReadyTypes(void)
if (PyType_Ready(&PyDict_Type) < 0) if (PyType_Ready(&PyDict_Type) < 0)
Py_FatalError("Can't initialize dict type"); Py_FatalError("Can't initialize dict type");
if (PyType_Ready(&PyDictKeys_Type) < 0)
Py_FatalError("Can't initialize dict keys type");
if (PyType_Ready(&PyDictValues_Type) < 0)
Py_FatalError("Can't initialize dict values type");
if (PyType_Ready(&PyDictItems_Type) < 0)
Py_FatalError("Can't initialize dict items type");
if (PyType_Ready(&PyODict_Type) < 0) if (PyType_Ready(&PyODict_Type) < 0)
Py_FatalError("Can't initialize OrderedDict type"); Py_FatalError("Can't initialize OrderedDict type");