[Python-checkins] r84718 - in python/branches/release31-maint: Objects/object.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Sep 11 18:40:47 2010
New Revision: 84718

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Objects/object.c

Modified: python/branches/release31-maint/Objects/object.c
==============================================================================
--- python/branches/release31-maint/Objects/object.c	(original)
+++ python/branches/release31-maint/Objects/object.c	Sat Sep 11 18:40:47 2010
@@ -479,13 +479,13 @@
         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;
     }