Merge 3.6 (issue #27942)

This commit is contained in:
Yury Selivanov 2016-11-09 09:43:37 -05:00
commit f787c90764
2 changed files with 4 additions and 0 deletions

View file

@ -77,6 +77,7 @@ intern_string_constants(PyObject *tuple)
intern_string_constants(v);
}
else if (PyFrozenSet_CheckExact(v)) {
PyObject *w = v;
PyObject *tmp = PySequence_Tuple(v);
if (tmp == NULL) {
PyErr_Clear();
@ -89,6 +90,7 @@ intern_string_constants(PyObject *tuple)
}
else {
PyTuple_SET_ITEM(tuple, i, v);
Py_DECREF(w);
modified = 1;
}
}