SF # 561244 Micro optimizations

Cleanup code a bit and return as early as possible.

diff --git a/Objects/object.c b/Objects/object.c
index 6e72c243a3133146d77078a469321d39a3d74943..b196d147489c9ad2774e24b6b2d2f350320c2371 100644 (file)
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1435,7 +1435,7 @@ PyObject_IsTrue(PyObject *v)
 {
        int res;
        if (v == Py_None)
-               res = 0;
+               return 0;
        else if (v->ob_type->tp_as_number != NULL &&
                 v->ob_type->tp_as_number->nb_nonzero != NULL)
                res = (*v->ob_type->tp_as_number->nb_nonzero)(v);
@@ -1446,10 +1446,8 @@ PyObject_IsTrue(PyObject *v)
                 v->ob_type->tp_as_sequence->sq_length != NULL)
                res = (*v->ob_type->tp_as_sequence->sq_length)(v);
        else
-               res = 1;
-       if (res > 0)
-               res = 1;
-       return res;
+               return 1;
+       return (res > 0) ? 1 : res;
 }
 
 /* equivalent of 'not v'