From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 4 Feb 2012 00:25:01 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~256
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=951138c79580f0d32d3aace10901f9c2387bd846;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

951138c79580f0d32d3aace10901f9c2387bd846
diff --cc Objects/exceptions.c
index 6529482f1faf,e01d6cfa1961..483ca65ba501
--- a/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);