Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

refactor logic a little when no sep or end is passed

This commit is contained in:
Benjamin Peterson 2009-07-02 18:25:26 +00:00
parent b18d26d1d4
commit c963731bb6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Python/bltinmodule.c
View File

@ -1459,13 +1459,19 @@ builtin_print(PyObject *self, PyObject *args, PyObject *kwds)
Py_RETURN_NONE; Py_RETURN_NONE;
} }
if (sep && sep != Py_None && !PyUnicode_Check(sep)) { if (sep == Py_None) {
sep = NULL;
}
else if (sep && !PyUnicode_Check(sep)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"sep must be None or a string, not %.200s", "sep must be None or a string, not %.200s",
sep->ob_type->tp_name); sep->ob_type->tp_name);
return NULL; return NULL;
} }
if (end && end != Py_None && !PyUnicode_Check(end)) { if (end == Py_None) {
end = NULL;
}
else if (end && !PyUnicode_Check(end)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"end must be None or a string, not %.200s", "end must be None or a string, not %.200s",
end->ob_type->tp_name); end->ob_type->tp_name);
@ -1474,7 +1480,7 @@ builtin_print(PyObject *self, PyObject *args, PyObject *kwds)
for (i = 0; i < PyTuple_Size(args); i++) { for (i = 0; i < PyTuple_Size(args); i++) {
if (i > 0) { if (i > 0) {
if (sep == NULL || sep == Py_None) if (sep == NULL)
err = PyFile_WriteString(" ", file); err = PyFile_WriteString(" ", file);
else else
err = PyFile_WriteObject(sep, file, err = PyFile_WriteObject(sep, file,
@ -1488,7 +1494,7 @@ builtin_print(PyObject *self, PyObject *args, PyObject *kwds)
return NULL; return NULL;
} }
if (end == NULL || end == Py_None) if (end == NULL)
err = PyFile_WriteString("\n", file); err = PyFile_WriteString("\n", file);
else else
err = PyFile_WriteObject(end, file, Py_PRINT_RAW); err = PyFile_WriteObject(end, file, Py_PRINT_RAW);