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
........

diff --git a/Objects/object.c b/Objects/object.c
index 2e6ddfa28cd414f101098828e5e697667f66962d..d5342738f48d50a82023d9c6bf5d9ed53627c6c1 100644 (file)
--- 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;
     }