diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-01-12 02:00:48 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-01-12 02:00:48 (GMT) |
| commit | 0ab2a26865963ae1a521ae2dee3c71d4bf5b9532 (patch) | |
| tree | f76e3b2dfe6feb5a240b9e978bc57fa94c460a15 /Python/bltinmodule.c | |
| parent | 21e0da228d158ec248be5c7db274a7bc54a51307 (diff) | |
| parent | 0010256de4cb40fe8597fd1395de1d9dee56ed55 (diff) | |
| download | cpython-0ab2a26865963ae1a521ae2dee3c71d4bf5b9532.zip cpython-0ab2a26865963ae1a521ae2dee3c71d4bf5b9532.tar.gz cpython-0ab2a26865963ae1a521ae2dee3c71d4bf5b9532.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Python/bltinmodule.c')
| -rw-r--r-- | Python/bltinmodule.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 022d432..d1630cc 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -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; |