From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Sep 2010 16:40:47 +0000 (+0000)
Subject: Merged revisions 84717 via svnmerge from
X-Git-Tag: v3.1.3rc1~247
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42bc69154fc751265dfeddd89085bc839ed1fc8d;p=python

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 2e6ddfa28c..d5342738f4 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;
     }