[Python-checkins] cpython: adjust style

[benjamin.peterson]

http://hg.python.org/cpython/rev/e0fb41d41642
changeset:   87096:e0fb41d41642
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Nov 13 23:25:01 2013 -0500
summary:
  adjust style

files:
  Objects/exceptions.c |  20 ++++++++------------
  1 files changed, 8 insertions(+), 12 deletions(-)


diff --git a/Objects/exceptions.c b/Objects/exceptions.c
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -2633,13 +2633,12 @@
     va_list vargs;
 
     PyErr_Fetch(&exc, &val, &tb);
-    caught_type = (PyTypeObject *) exc;
+    caught_type = (PyTypeObject *)exc;
     /* Ensure type info indicates no extra state is stored at the C level */
-    if (caught_type->tp_init != (initproc) BaseException_init ||
+    if (caught_type->tp_init != (initproc)BaseException_init ||
         caught_type->tp_new != BaseException_new ||
         caught_type->tp_basicsize != _PyExc_BaseException.tp_basicsize ||
-        caught_type->tp_itemsize != _PyExc_BaseException.tp_itemsize
-       ) {
+        caught_type->tp_itemsize != _PyExc_BaseException.tp_itemsize) {
         /* We can't be sure we can wrap this safely, since it may contain
          * more state than just the exception type. Accordingly, we just
          * leave it alone.
@@ -2650,13 +2649,11 @@
 
     /* Check the args are empty or contain a single string */
     PyErr_NormalizeException(&exc, &val, &tb);
-    instance_args = ((PyBaseExceptionObject *) val)->args;
+    instance_args = ((PyBaseExceptionObject *)val)->args;
     num_args = PyTuple_GET_SIZE(instance_args);
-    if ((num_args > 1) ||
+    if (num_args > 1 ||
         (num_args == 1 &&
-         !PyUnicode_CheckExact(PyTuple_GET_ITEM(instance_args, 0))
-        )
-       ) {
+         !PyUnicode_CheckExact(PyTuple_GET_ITEM(instance_args, 0)))) {
         /* More than 1 arg, or the one arg we do have isn't a string
          */
         PyErr_Restore(exc, val, tb);
@@ -2665,9 +2662,8 @@
 
     /* Ensure the instance dict is also empty */
     dictptr = _PyObject_GetDictPtr(val);
-    if ((dictptr != NULL) && (*dictptr != NULL) &&
-        (PyObject_Length(*dictptr) > 0)
-       ) {
+    if (dictptr != NULL && *dictptr != NULL &&
+        PyObject_Length(*dictptr) > 0) {
         /* While we could potentially copy a non-empty instance dictionary
          * to the replacement exception, for now we take the more
          * conservative path of leaving exceptions with attributes set

-- 
Repository URL: http://hg.python.org/cpython