merge 3.2

This commit is contained in:
Benjamin Peterson 2012-09-02 16:37:09 -04:00
commit d40528fe9a

View file

@ -545,9 +545,9 @@ init_normalization(struct compiling *c)
} }
static identifier static identifier
new_identifier(const char* n, struct compiling *c) new_identifier(const char *n, struct compiling *c)
{ {
PyObject* id = PyUnicode_DecodeUTF8(n, strlen(n), NULL); PyObject *id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
if (!id) if (!id)
return NULL; return NULL;
/* PyUnicode_DecodeUTF8 should always return a ready string. */ /* PyUnicode_DecodeUTF8 should always return a ready string. */