Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #13783: PEP 380 cleanup part 2, using the new identifier APIs in the generator implementation

This commit is contained in:
Nick Coghlan 2012-06-17 15:45:11 +10:00
parent c40bc09942
commit 5b0dac12b8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -10,6 +10,8 @@ What's New in Python 3.3.0 Beta 1?
Core and Builtins
-----------------
- Issue #13783: Generator objects now use the identifier APIs internally
- Issue #14874: Restore charmap decoding speed to pre-PEP 393 levels.
Patch by Serhiy Storchaka.

6
Objects/genobject.c
View File

@ -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);