]> granicus.if.org Git - python/commitdiff
merge 3.4 (#27783)
authorBenjamin Peterson <benjamin@python.org>
Wed, 17 Aug 2016 06:37:33 +0000 (23:37 -0700)
committerBenjamin Peterson <benjamin@python.org>
Wed, 17 Aug 2016 06:37:33 +0000 (23:37 -0700)
1  2 
Misc/NEWS
Modules/_operator.c

diff --cc Misc/NEWS
Simple merge
index eb4f3a34edbf64085c6f6fba4ddb9c9409b99bc3,f294769980271c6ac7984eabb019f87eeed14f73..dfff1d2faa1400e90e05b66bd60b8673ec569107
@@@ -951,15 -814,8 +951,9 @@@ methodcaller_new(PyTypeObject *type, Py
      if (mc == NULL)
          return NULL;
  
-     newargs = PyTuple_GetSlice(args, 1, PyTuple_GET_SIZE(args));
-     if (newargs == NULL) {
-         Py_DECREF(mc);
-         return NULL;
-     }
-     mc->args = newargs;
+     name = PyTuple_GET_ITEM(args, 0);
      Py_INCREF(name);
 +    PyUnicode_InternInPlace(&name);
      mc->name = name;
  
      Py_XINCREF(kwds);