[Python-checkins] cpython (2.7): put returns on their own lines
benjamin.peterson
python-checkins at python.org
Sat Feb 4 01:25:07 CET 2012
http://hg.python.org/cpython/rev/93cfb0bff87a
changeset: 74751:93cfb0bff87a
branch: 2.7
parent: 74748:6fb2eb6398bf
user: Benjamin Peterson <benjamin at python.org>
date: Fri Feb 03 19:22:31 2012 -0500
summary:
put returns on their own lines
files:
Objects/exceptions.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -306,7 +306,8 @@
return -1;
}
seq = PySequence_Tuple(val);
- if (!seq) return -1;
+ if (!seq)
+ return -1;
Py_CLEAR(self->args);
self->args = seq;
return 0;
@@ -773,7 +774,8 @@
* file name given to EnvironmentError. */
if (PyTuple_GET_SIZE(args) == 2 && self->filename) {
args = PyTuple_New(3);
- if (!args) return NULL;
+ if (!args)
+ return NULL;
tmp = PyTuple_GET_ITEM(self->args, 0);
Py_INCREF(tmp);
@@ -1071,7 +1073,8 @@
if (lenargs == 2) {
info = PyTuple_GET_ITEM(args, 1);
info = PySequence_Tuple(info);
- if (!info) return -1;
+ if (!info)
+ return -1;
if (PyTuple_GET_SIZE(info) != 4) {
/* not a very good error message, but it's what Python 2.4 gives */
@@ -1167,9 +1170,11 @@
str = PyObject_Str(self->msg);
else
str = PyObject_Str(Py_None);
- if (!str) return NULL;
+ if (!str)
+ return NULL;
/* Don't fiddle with non-string return (shouldn't happen anyway) */
- if (!PyString_Check(str)) return str;
+ if (!PyString_Check(str))
+ return str;
/* XXX -- do all the additional formatting with filename and
lineno here */
@@ -2111,7 +2116,8 @@
m = Py_InitModule4("exceptions", functions, exceptions_doc,
(PyObject *)NULL, PYTHON_API_VERSION);
- if (m == NULL) return;
+ if (m == NULL)
+ return;
bltinmod = PyImport_ImportModule("__builtin__");
if (bltinmod == NULL)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list