merge heads

This commit is contained in:
Benjamin Peterson 2012-09-11 12:05:18 -04:00
commit 787269797e
1 changed files with 1 additions and 5 deletions

View File

@ -254,12 +254,8 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
char *string;
Py_ssize_t len;
if (!PyUnicode_Check(v)) {
PyErr_BadArgument();
return -1;
}
string = _PyUnicode_AsStringAndSize(v, &len);
if (len != 1) {
if (string == NULL || len != 1) {
PyErr_BadArgument();
return -1;
}