From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 Jan 2012 01:04:58 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~313
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ef2f8c296ec144586fe35babbaf9d644c7ad222;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

3ef2f8c296ec144586fe35babbaf9d644c7ad222
diff --cc Modules/_posixsubprocess.c
index 3d4eb7722cb4,d520c8c7692e..c8f2500a8a57
--- a/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);