merge 3.2

diff --cc Objects/exceptions.c
index 6529482f1fafe66427938c5c2229062464002157,e01d6cfa19612e3da437f6c05f97e235a9a4afcd..483ca65ba5014637c5f93835f90ccfd31b2cdec4
--- 1/Objects/exceptions.c
--- 2/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@@ -958,10 -672,11 +961,11 @@@ OSError_reduce(PyOSErrorObject *self
      PyObject *res = NULL, *tmp;
  
      /* self->args is only the first two real arguments if there was a
 -     * file name given to EnvironmentError. */
 +     * file name given to OSError. */
      if (PyTuple_GET_SIZE(args) == 2 && self->filename) {
          args = PyTuple_New(3);
-         if (!args) return NULL;
+         if (!args)
+             return NULL;
  
          tmp = PyTuple_GET_ITEM(self->args, 0);
          Py_INCREF(tmp);