summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-09-11 16:40:47 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-09-11 16:40:47 (GMT)
commit42bc69154fc751265dfeddd89085bc839ed1fc8d (patch)
tree1213c16a95b7471a81458e766b1e0a57fc23a09f
parent5d7d9e6899222885da76f578fa0c70e5946badbb (diff)
downloadcpython-42bc69154fc751265dfeddd89085bc839ed1fc8d.zip
cpython-42bc69154fc751265dfeddd89085bc839ed1fc8d.tar.gz
cpython-42bc69154fc751265dfeddd89085bc839ed1fc8d.tar.bz2
Merged revisions 84717 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84717 | benjamin.peterson | 2010-09-11 11:39:57 -0500 (Sat, 11 Sep 2010) | 1 line fix formatting ........
-rw-r--r--Objects/object.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/Objects/object.c b/Objects/object.c
index 2e6ddfa..d534273 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -479,13 +479,13 @@ PyObject_Bytes(PyObject *v)
result = PyObject_CallFunctionObjArgs(func, NULL);
Py_DECREF(func);
if (result == NULL)
- return NULL;
+ return NULL;
if (!PyBytes_Check(result)) {
- PyErr_Format(PyExc_TypeError,
- "__bytes__ returned non-bytes (type %.200s)",
- Py_TYPE(result)->tp_name);
- Py_DECREF(result);
- return NULL;
+ PyErr_Format(PyExc_TypeError,
+ "__bytes__ returned non-bytes (type %.200s)",
+ Py_TYPE(result)->tp_name);
+ Py_DECREF(result);
+ return NULL;
}
return result;
}