Add a separate NEWS entry for a change to PyObject_CallMethod in the PEP 380 patch, and make the private CallMethod variants consistent with the public one

ncoghlan · ncoghlan · commit 138f4656e38f · 2012-01-14T16:45:48.000+10:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -2449,6 +2449,9 @@ Library
 C-API
 -----
 
+- PyObject_CallMethod now passes along any underlying AttributeError from
+  PyObject_GetAttr, instead of replacing it with something less informative
+
 - Issue #10913: Deprecate misleading functions PyEval_AcquireLock() and
   PyEval_ReleaseLock().  The thread-state aware APIs should be used instead.
 
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -2288,7 +2288,6 @@ _PyObject_CallMethodId(PyObject *o, _Py_Identifier *name, char *format, ...)
 
     func = _PyObject_GetAttrId(o, name);
     if (func == NULL) {
-        PyErr_SetString(PyExc_AttributeError, name->string);
         return 0;
     }
 
@@ -2330,7 +2329,6 @@ _PyObject_CallMethodId_SizeT(PyObject *o, _Py_Identifier *name, char *format, ..
 
     func = _PyObject_GetAttrId(o, name);
     if (func == NULL) {
-        PyErr_SetString(PyExc_AttributeError, name->string);
         return NULL;
     }
     va_start(va, format);

Original file line number	Diff line number	Diff line change
`@@ -2288,7 +2288,6 @@ _PyObject_CallMethodId(PyObject o, _Py_Identifier name, char *format, ...)`
`2288`	`2288`
`2289`	`2289`	`func = _PyObject_GetAttrId(o, name);`
`2290`	`2290`	`if (func == NULL) {`
`2291`		`- PyErr_SetString(PyExc_AttributeError, name->string);`
`2292`	`2291`	`return 0;`
`2293`	`2292`	`}`
`2294`	`2293`
`@@ -2330,7 +2329,6 @@ _PyObject_CallMethodId_SizeT(PyObject o, _Py_Identifier name, char *format, ..`
`2330`	`2329`
`2331`	`2330`	`func = _PyObject_GetAttrId(o, name);`
`2332`	`2331`	`if (func == NULL) {`
`2333`		`- PyErr_SetString(PyExc_AttributeError, name->string);`
`2334`	`2332`	`return NULL;`
`2335`	`2333`	`}`
`2336`	`2334`	`va_start(va, format);`