merge 3.2

diff --cc Modules/_posixsubprocess.c
index 3d4eb7722cb4a54daab0553a974ad2b78e3b7a67,d520c8c7692efc007b80da3f102e774b32f79e68..c8f2500a8a57aa99d1a93e92a043ab185c32f3c5
--- 1/Modules/_posixsubprocess.c
--- 2/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@@ -43,12 -43,11 +43,13 @@@ static long max_fd
  
  
  /* Given the gc module call gc.enable() and return 0 on success. */
- static int _enable_gc(PyObject *gc_module)
+ static int
+ _enable_gc(PyObject *gc_module)
  {
      PyObject *result;
 -    result = PyObject_CallMethod(gc_module, "enable", NULL);
 +    _Py_IDENTIFIER(enable);
 +
 +    result = _PyObject_CallMethodId(gc_module, &PyId_enable, NULL);
      if (result == NULL)
          return 1;
      Py_DECREF(result);