merge 3.2

This commit is contained in:
Benjamin Peterson 2012-01-11 21:00:48 -05:00
commit 0ab2a26865
1 changed files with 1 additions and 3 deletions

View File

@ -1489,10 +1489,8 @@ builtin_print(PyObject *self, PyObject *args, PyObject *kwds)
PyObject *sep = NULL, *end = NULL, *file = NULL;
int i, err;
if (dummy_args == NULL) {
if (!(dummy_args = PyTuple_New(0)))
if (dummy_args == NULL && !(dummy_args = PyTuple_New(0)))
return NULL;
}
if (!PyArg_ParseTupleAndKeywords(dummy_args, kwds, "|OOO:print",
kwlist, &sep, &end, &file))
return NULL;