summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2012-06-17 05:45:11 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2012-06-17 05:45:11 (GMT)
commit5b0dac12b81f4af01506fb61184515147bee7a09 (patch)
treeb51588b2df3ee9c6b0e2f4f3157019536732123d /Objects
parentc40bc09942f9532ed957dc8cd4da269ec089e830 (diff)
downloadcpython-5b0dac12b81f4af01506fb61184515147bee7a09.zip
cpython-5b0dac12b81f4af01506fb61184515147bee7a09.tar.gz
cpython-5b0dac12b81f4af01506fb61184515147bee7a09.tar.bz2
Issue #13783: PEP 380 cleanup part 2, using the new identifier APIs in the generator implementation
Diffstat (limited to 'Objects')
-rw-r--r--Objects/genobject.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Objects/genobject.c b/Objects/genobject.c
index 6018e5b..597aed3 100644
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -149,13 +149,14 @@ static int
gen_close_iter(PyObject *yf)
{
PyObject *retval = NULL;
+ _Py_IDENTIFIER(close);
if (PyGen_CheckExact(yf)) {
retval = gen_close((PyGenObject *)yf, NULL);
if (retval == NULL)
return -1;
} else {
- PyObject *meth = PyObject_GetAttrString(yf, "close");
+ PyObject *meth = _PyObject_GetAttrId(yf, &PyId_close);
if (meth == NULL) {
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
PyErr_WriteUnraisable(yf);
@@ -295,6 +296,7 @@ gen_throw(PyGenObject *gen, PyObject *args)
PyObject *tb = NULL;
PyObject *val = NULL;
PyObject *yf = gen_yf(gen);
+ _Py_IDENTIFIER(throw);
if (!PyArg_UnpackTuple(args, "throw", 1, 3, &typ, &val, &tb))
return NULL;
@@ -316,7 +318,7 @@ gen_throw(PyGenObject *gen, PyObject *args)
ret = gen_throw((PyGenObject *)yf, args);
gen->gi_running = 0;
} else {
- PyObject *meth = PyObject_GetAttrString(yf, "throw");
+ PyObject *meth = _PyObject_GetAttrId(yf, &PyId_throw);
if (meth == NULL) {
if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
Py_DECREF(yf);