2004-06-01 17:22:42 +02:00
|
|
|
/* Generator object implementation */
|
|
|
|
|
|
|
|
#include "Python.h"
|
|
|
|
#include "frameobject.h"
|
|
|
|
#include "structmember.h"
|
2006-04-21 12:40:58 +02:00
|
|
|
#include "opcode.h"
|
2004-06-01 17:22:42 +02:00
|
|
|
|
2012-01-13 12:43:40 +01:00
|
|
|
static PyObject *gen_close(PyGenObject *gen, PyObject *args);
|
|
|
|
|
2004-06-01 17:22:42 +02:00
|
|
|
static int
|
|
|
|
gen_traverse(PyGenObject *gen, visitproc visit, void *arg)
|
|
|
|
{
|
2010-05-09 17:52:27 +02:00
|
|
|
Py_VISIT((PyObject *)gen->gi_frame);
|
|
|
|
Py_VISIT(gen->gi_code);
|
|
|
|
return 0;
|
2004-06-01 17:22:42 +02:00
|
|
|
}
|
|
|
|
|
2013-08-05 23:26:40 +02:00
|
|
|
void
|
|
|
|
_PyGen_Finalize(PyObject *self)
|
2013-07-30 19:59:21 +02:00
|
|
|
{
|
|
|
|
PyGenObject *gen = (PyGenObject *)self;
|
|
|
|
PyObject *res;
|
|
|
|
PyObject *error_type, *error_value, *error_traceback;
|
|
|
|
|
|
|
|
if (gen->gi_frame == NULL || gen->gi_frame->f_stacktop == NULL)
|
|
|
|
/* Generator isn't paused, so no need to close */
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Save the current exception, if any. */
|
|
|
|
PyErr_Fetch(&error_type, &error_value, &error_traceback);
|
|
|
|
|
|
|
|
res = gen_close(gen, NULL);
|
|
|
|
|
|
|
|
if (res == NULL)
|
|
|
|
PyErr_WriteUnraisable(self);
|
|
|
|
else
|
|
|
|
Py_DECREF(res);
|
|
|
|
|
|
|
|
/* Restore the saved exception. */
|
|
|
|
PyErr_Restore(error_type, error_value, error_traceback);
|
|
|
|
}
|
|
|
|
|
2004-06-01 17:22:42 +02:00
|
|
|
static void
|
|
|
|
gen_dealloc(PyGenObject *gen)
|
|
|
|
{
|
2010-05-09 17:52:27 +02:00
|
|
|
PyObject *self = (PyObject *) gen;
|
2005-08-02 02:46:46 +02:00
|
|
|
|
2010-05-09 17:52:27 +02:00
|
|
|
_PyObject_GC_UNTRACK(gen);
|
2005-08-02 02:46:46 +02:00
|
|
|
|
2010-05-09 17:52:27 +02:00
|
|
|
if (gen->gi_weakreflist != NULL)
|
|
|
|
PyObject_ClearWeakRefs(self);
|
2005-08-02 02:46:46 +02:00
|
|
|
|
2013-05-14 20:37:52 +02:00
|
|
|
_PyObject_GC_TRACK(self);
|
|
|
|
|
2013-07-30 19:59:21 +02:00
|
|
|
if (PyObject_CallFinalizerFromDealloc(self))
|
|
|
|
return; /* resurrected. :( */
|
2013-05-14 20:37:52 +02:00
|
|
|
|
|
|
|
_PyObject_GC_UNTRACK(self);
|
|
|
|
Py_CLEAR(gen->gi_frame);
|
2010-05-09 17:52:27 +02:00
|
|
|
Py_CLEAR(gen->gi_code);
|
|
|
|
PyObject_GC_Del(gen);
|
2004-06-01 17:22:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2005-08-02 02:46:46 +02:00
|
|
|
gen_send_ex(PyGenObject *gen, PyObject *arg, int exc)
|
2004-06-01 17:22:42 +02:00
|
|
|
{
|
2013-05-14 20:37:52 +02:00
|
|
|
PyThreadState *tstate = PyThreadState_GET();
|
2010-05-09 17:52:27 +02:00
|
|
|
PyFrameObject *f = gen->gi_frame;
|
2013-05-14 20:37:52 +02:00
|
|
|
PyObject *result;
|
2010-05-09 17:52:27 +02:00
|
|
|
|
2012-03-15 21:37:39 +01:00
|
|
|
if (gen->gi_running) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"generator already executing");
|
|
|
|
return NULL;
|
|
|
|
}
|
2013-05-14 20:37:52 +02:00
|
|
|
if (f == NULL || f->f_stacktop == NULL) {
|
|
|
|
/* Only set exception if called from send() */
|
2010-05-09 17:52:27 +02:00
|
|
|
if (arg && !exc)
|
|
|
|
PyErr_SetNone(PyExc_StopIteration);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-05-14 20:37:52 +02:00
|
|
|
if (f->f_lasti == -1) {
|
|
|
|
if (arg && arg != Py_None) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"can't send non-None value to a "
|
|
|
|
"just-started generator");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Push arg onto the frame's value stack */
|
|
|
|
result = arg ? arg : Py_None;
|
|
|
|
Py_INCREF(result);
|
|
|
|
*(f->f_stacktop++) = result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Generators always return to their most recent caller, not
|
|
|
|
* necessarily their creator. */
|
|
|
|
Py_XINCREF(tstate->frame);
|
|
|
|
assert(f->f_back == NULL);
|
|
|
|
f->f_back = tstate->frame;
|
|
|
|
|
|
|
|
gen->gi_running = 1;
|
|
|
|
result = PyEval_EvalFrameEx(f, exc);
|
|
|
|
gen->gi_running = 0;
|
|
|
|
|
|
|
|
/* Don't keep the reference to f_back any longer than necessary. It
|
|
|
|
* may keep a chain of frames alive or it could create a reference
|
|
|
|
* cycle. */
|
|
|
|
assert(f->f_back == tstate->frame);
|
|
|
|
Py_CLEAR(f->f_back);
|
|
|
|
|
|
|
|
/* If the generator just returned (as opposed to yielding), signal
|
|
|
|
* that the generator is exhausted. */
|
|
|
|
if (result && f->f_stacktop == NULL) {
|
|
|
|
if (result == Py_None) {
|
|
|
|
/* Delay exception instantiation if we can */
|
|
|
|
PyErr_SetNone(PyExc_StopIteration);
|
|
|
|
} else {
|
|
|
|
PyObject *e = PyObject_CallFunctionObjArgs(
|
|
|
|
PyExc_StopIteration, result, NULL);
|
|
|
|
if (e != NULL) {
|
|
|
|
PyErr_SetObject(PyExc_StopIteration, e);
|
|
|
|
Py_DECREF(e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_CLEAR(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!result || f->f_stacktop == NULL) {
|
|
|
|
/* generator can't be rerun, so release the frame */
|
|
|
|
/* first clean reference cycle through stored exception traceback */
|
|
|
|
PyObject *t, *v, *tb;
|
|
|
|
t = f->f_exc_type;
|
|
|
|
v = f->f_exc_value;
|
|
|
|
tb = f->f_exc_traceback;
|
|
|
|
f->f_exc_type = NULL;
|
|
|
|
f->f_exc_value = NULL;
|
|
|
|
f->f_exc_traceback = NULL;
|
|
|
|
Py_XDECREF(t);
|
|
|
|
Py_XDECREF(v);
|
|
|
|
Py_XDECREF(tb);
|
2013-08-05 23:26:40 +02:00
|
|
|
gen->gi_frame->f_gen = NULL;
|
2013-05-14 20:37:52 +02:00
|
|
|
gen->gi_frame = NULL;
|
|
|
|
Py_DECREF(f);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
2004-06-01 17:22:42 +02:00
|
|
|
}
|
|
|
|
|
2005-08-02 02:46:46 +02:00
|
|
|
PyDoc_STRVAR(send_doc,
|
2006-04-21 12:40:58 +02:00
|
|
|
"send(arg) -> send 'arg' into generator,\n\
|
|
|
|
return next yielded value or raise StopIteration.");
|
2005-08-02 02:46:46 +02:00
|
|
|
|
2012-03-15 21:37:39 +01:00
|
|
|
PyObject *
|
|
|
|
_PyGen_Send(PyGenObject *gen, PyObject *arg)
|
2005-08-02 02:46:46 +02:00
|
|
|
{
|
2012-03-15 21:37:39 +01:00
|
|
|
return gen_send_ex(gen, arg, 0);
|
2005-08-02 02:46:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(close_doc,
|
2012-05-04 00:44:09 +02:00
|
|
|
"close() -> raise GeneratorExit inside generator.");
|
2005-08-02 02:46:46 +02:00
|
|
|
|
2012-01-13 12:43:40 +01:00
|
|
|
/*
|
|
|
|
* This helper function is used by gen_close and gen_throw to
|
|
|
|
* close a subiterator being delegated to by yield-from.
|
|
|
|
*/
|
|
|
|
|
2013-05-14 20:37:52 +02:00
|
|
|
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_GetAttrId(yf, &PyId_close);
|
|
|
|
if (meth == NULL) {
|
|
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError))
|
|
|
|
PyErr_WriteUnraisable(yf);
|
|
|
|
PyErr_Clear();
|
|
|
|
} else {
|
|
|
|
retval = PyObject_CallFunction(meth, "");
|
|
|
|
Py_DECREF(meth);
|
|
|
|
if (retval == NULL)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Py_XDECREF(retval);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-03-15 21:37:39 +01:00
|
|
|
static PyObject *
|
|
|
|
gen_yf(PyGenObject *gen)
|
|
|
|
{
|
2013-05-14 20:37:52 +02:00
|
|
|
PyObject *yf = NULL;
|
2012-03-15 21:37:39 +01:00
|
|
|
PyFrameObject *f = gen->gi_frame;
|
2013-05-14 20:37:52 +02:00
|
|
|
|
|
|
|
if (f && f->f_stacktop) {
|
|
|
|
PyObject *bytecode = f->f_code->co_code;
|
|
|
|
unsigned char *code = (unsigned char *)PyBytes_AS_STRING(bytecode);
|
|
|
|
|
|
|
|
if (code[f->f_lasti + 1] != YIELD_FROM)
|
|
|
|
return NULL;
|
|
|
|
yf = f->f_stacktop[-1];
|
|
|
|
Py_INCREF(yf);
|
|
|
|
}
|
|
|
|
|
|
|
|
return yf;
|
2012-03-15 21:37:39 +01:00
|
|
|
}
|
2012-01-13 12:43:40 +01:00
|
|
|
|
2005-08-02 02:46:46 +02:00
|
|
|
static PyObject *
|
|
|
|
gen_close(PyGenObject *gen, PyObject *args)
|
|
|
|
{
|
2013-05-14 20:37:52 +02:00
|
|
|
PyObject *retval;
|
|
|
|
PyObject *yf = gen_yf(gen);
|
|
|
|
int err = 0;
|
2012-01-13 12:43:40 +01:00
|
|
|
|
2013-05-14 20:37:52 +02:00
|
|
|
if (yf) {
|
|
|
|
gen->gi_running = 1;
|
|
|
|
err = gen_close_iter(yf);
|
|
|
|
gen->gi_running = 0;
|
|
|
|
Py_DECREF(yf);
|
|
|
|
}
|
|
|
|
if (err == 0)
|
|
|
|
PyErr_SetNone(PyExc_GeneratorExit);
|
|
|
|
retval = gen_send_ex(gen, Py_None, 1);
|
|
|
|
if (retval) {
|
|
|
|
Py_DECREF(retval);
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"generator ignored GeneratorExit");
|
2010-05-09 17:52:27 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
2013-05-14 20:37:52 +02:00
|
|
|
if (PyErr_ExceptionMatches(PyExc_StopIteration)
|
|
|
|
|| PyErr_ExceptionMatches(PyExc_GeneratorExit)) {
|
|
|
|
PyErr_Clear(); /* ignore these errors */
|
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-08-02 02:46:46 +02:00
|
|
|
|
2013-05-14 20:37:52 +02:00
|
|
|
|
2005-08-02 02:46:46 +02:00
|
|
|
PyDoc_STRVAR(throw_doc,
|
2006-04-21 12:40:58 +02:00
|
|
|
"throw(typ[,val[,tb]]) -> raise exception in generator,\n\
|
|
|
|
return next yielded value or raise StopIteration.");
|
2005-08-02 02:46:46 +02:00
|
|
|
|
|
|
|
static PyObject *
|
2006-04-21 12:40:58 +02:00
|
|
|
gen_throw(PyGenObject *gen, PyObject *args)
|
2005-08-02 02:46:46 +02:00
|
|
|
{
|
2010-05-09 17:52:27 +02:00
|
|
|
PyObject *typ;
|
|
|
|
PyObject *tb = NULL;
|
|
|
|
PyObject *val = NULL;
|
2012-03-15 21:37:39 +01:00
|
|
|
PyObject *yf = gen_yf(gen);
|
2012-06-17 07:45:11 +02:00
|
|
|
_Py_IDENTIFIER(throw);
|
2010-05-09 17:52:27 +02:00
|
|
|
|
|
|
|
if (!PyArg_UnpackTuple(args, "throw", 1, 3, &typ, &val, &tb))
|
|
|
|
return NULL;
|
|
|
|
|
2012-01-13 12:43:40 +01:00
|
|
|
if (yf) {
|
|
|
|
PyObject *ret;
|
|
|
|
int err;
|
|
|
|
if (PyErr_GivenExceptionMatches(typ, PyExc_GeneratorExit)) {
|
2012-03-15 21:37:39 +01:00
|
|
|
gen->gi_running = 1;
|
2013-05-14 20:37:52 +02:00
|
|
|
err = gen_close_iter(yf);
|
2012-03-15 21:37:39 +01:00
|
|
|
gen->gi_running = 0;
|
2012-01-13 12:43:40 +01:00
|
|
|
Py_DECREF(yf);
|
|
|
|
if (err < 0)
|
|
|
|
return gen_send_ex(gen, Py_None, 1);
|
|
|
|
goto throw_here;
|
|
|
|
}
|
|
|
|
if (PyGen_CheckExact(yf)) {
|
2012-03-15 21:37:39 +01:00
|
|
|
gen->gi_running = 1;
|
2012-01-13 12:43:40 +01:00
|
|
|
ret = gen_throw((PyGenObject *)yf, args);
|
2012-03-15 21:37:39 +01:00
|
|
|
gen->gi_running = 0;
|
2012-01-13 12:43:40 +01:00
|
|
|
} else {
|
2012-06-17 07:45:11 +02:00
|
|
|
PyObject *meth = _PyObject_GetAttrId(yf, &PyId_throw);
|
2012-01-13 12:43:40 +01:00
|
|
|
if (meth == NULL) {
|
|
|
|
if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
|
|
|
Py_DECREF(yf);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
PyErr_Clear();
|
|
|
|
Py_DECREF(yf);
|
|
|
|
goto throw_here;
|
|
|
|
}
|
2012-03-15 21:37:39 +01:00
|
|
|
gen->gi_running = 1;
|
2012-01-13 12:43:40 +01:00
|
|
|
ret = PyObject_CallObject(meth, args);
|
2012-03-15 21:37:39 +01:00
|
|
|
gen->gi_running = 0;
|
2012-01-13 12:43:40 +01:00
|
|
|
Py_DECREF(meth);
|
|
|
|
}
|
|
|
|
Py_DECREF(yf);
|
|
|
|
if (!ret) {
|
|
|
|
PyObject *val;
|
2012-03-15 21:37:39 +01:00
|
|
|
/* Pop subiterator from stack */
|
|
|
|
ret = *(--gen->gi_frame->f_stacktop);
|
|
|
|
assert(ret == yf);
|
|
|
|
Py_DECREF(ret);
|
|
|
|
/* Termination repetition of YIELD_FROM */
|
|
|
|
gen->gi_frame->f_lasti++;
|
2012-06-17 07:15:49 +02:00
|
|
|
if (_PyGen_FetchStopIterationValue(&val) == 0) {
|
2012-01-13 12:43:40 +01:00
|
|
|
ret = gen_send_ex(gen, val, 0);
|
|
|
|
Py_DECREF(val);
|
|
|
|
} else {
|
|
|
|
ret = gen_send_ex(gen, Py_None, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
throw_here:
|
2010-05-09 17:52:27 +02:00
|
|
|
/* First, check the traceback argument, replacing None with
|
|
|
|
NULL. */
|
2011-10-19 22:57:40 +02:00
|
|
|
if (tb == Py_None) {
|
2010-05-09 17:52:27 +02:00
|
|
|
tb = NULL;
|
2011-10-19 22:57:40 +02:00
|
|
|
}
|
2010-05-09 17:52:27 +02:00
|
|
|
else if (tb != NULL && !PyTraceBack_Check(tb)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"throw() third argument must be a traceback object");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_INCREF(typ);
|
|
|
|
Py_XINCREF(val);
|
|
|
|
Py_XINCREF(tb);
|
|
|
|
|
2011-10-19 22:57:40 +02:00
|
|
|
if (PyExceptionClass_Check(typ))
|
2010-05-09 17:52:27 +02:00
|
|
|
PyErr_NormalizeException(&typ, &val, &tb);
|
|
|
|
|
|
|
|
else if (PyExceptionInstance_Check(typ)) {
|
|
|
|
/* Raising an instance. The value should be a dummy. */
|
|
|
|
if (val && val != Py_None) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"instance exception may not have a separate value");
|
|
|
|
goto failed_throw;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Normalize to raise <class>, <instance> */
|
|
|
|
Py_XDECREF(val);
|
|
|
|
val = typ;
|
|
|
|
typ = PyExceptionInstance_Class(typ);
|
|
|
|
Py_INCREF(typ);
|
2011-10-18 16:40:50 +02:00
|
|
|
|
2011-10-19 22:57:40 +02:00
|
|
|
if (tb == NULL)
|
2011-10-18 16:40:50 +02:00
|
|
|
/* Returns NULL if there's no traceback */
|
|
|
|
tb = PyException_GetTraceback(val);
|
2010-05-09 17:52:27 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Not something you can raise. throw() fails. */
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"exceptions must be classes or instances "
|
|
|
|
"deriving from BaseException, not %s",
|
2012-01-13 12:43:40 +01:00
|
|
|
Py_TYPE(typ)->tp_name);
|
2010-05-09 17:52:27 +02:00
|
|
|
goto failed_throw;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyErr_Restore(typ, val, tb);
|
|
|
|
return gen_send_ex(gen, Py_None, 1);
|
2005-08-02 02:46:46 +02:00
|
|
|
|
|
|
|
failed_throw:
|
2010-05-09 17:52:27 +02:00
|
|
|
/* Didn't use our arguments, so restore their original refcounts */
|
|
|
|
Py_DECREF(typ);
|
|
|
|
Py_XDECREF(val);
|
|
|
|
Py_XDECREF(tb);
|
|
|
|
return NULL;
|
2005-08-02 02:46:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
gen_iternext(PyGenObject *gen)
|
|
|
|
{
|
2012-01-13 12:43:40 +01:00
|
|
|
PyObject *val = NULL;
|
|
|
|
PyObject *ret;
|
2012-03-15 21:37:39 +01:00
|
|
|
ret = gen_send_ex(gen, val, 0);
|
2012-01-13 12:43:40 +01:00
|
|
|
Py_XDECREF(val);
|
|
|
|
return ret;
|
2005-08-02 02:46:46 +02:00
|
|
|
}
|
|
|
|
|
2012-01-13 12:43:40 +01:00
|
|
|
/*
|
|
|
|
* If StopIteration exception is set, fetches its 'value'
|
|
|
|
* attribute if any, otherwise sets pvalue to None.
|
|
|
|
*
|
|
|
|
* Returns 0 if no exception or StopIteration is set.
|
|
|
|
* If any other exception is set, returns -1 and leaves
|
|
|
|
* pvalue unchanged.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2012-06-17 07:15:49 +02:00
|
|
|
_PyGen_FetchStopIterationValue(PyObject **pvalue) {
|
2012-01-13 12:43:40 +01:00
|
|
|
PyObject *et, *ev, *tb;
|
|
|
|
PyObject *value = NULL;
|
2012-03-15 21:37:39 +01:00
|
|
|
|
2012-01-13 12:43:40 +01:00
|
|
|
if (PyErr_ExceptionMatches(PyExc_StopIteration)) {
|
|
|
|
PyErr_Fetch(&et, &ev, &tb);
|
|
|
|
Py_XDECREF(et);
|
|
|
|
Py_XDECREF(tb);
|
|
|
|
if (ev) {
|
|
|
|
value = ((PyStopIterationObject *)ev)->value;
|
2012-01-13 21:06:12 +01:00
|
|
|
Py_INCREF(value);
|
2012-01-13 12:43:40 +01:00
|
|
|
Py_DECREF(ev);
|
|
|
|
}
|
|
|
|
} else if (PyErr_Occurred()) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (value == NULL) {
|
|
|
|
value = Py_None;
|
2012-01-13 21:06:12 +01:00
|
|
|
Py_INCREF(value);
|
2012-01-13 12:43:40 +01:00
|
|
|
}
|
|
|
|
*pvalue = value;
|
|
|
|
return 0;
|
|
|
|
}
|
2005-08-02 02:46:46 +02:00
|
|
|
|
Merged revisions 63208-63209,63211-63212,63214-63217,63219-63224,63226-63227,63229-63232,63234-63235,63237-63239,63241,63243-63246,63250-63254,63256-63259,63261,63263-63264,63266-63267,63269-63270,63272-63273,63275-63276,63278,63280-63281,63283-63284,63286-63287,63289-63290,63292-63293,63295-63296,63298-63299,63301-63302,63304-63305,63307,63309-63314,63316-63322,63324-63325,63327-63335,63337-63338,63340-63342,63344-63346,63348 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63208 | georg.brandl | 2008-05-13 15:04:54 -0400 (Tue, 13 May 2008) | 2 lines
#2831: add start argument to enumerate(). Patch by Scott Dial and me.
........
r63209 | marc-andre.lemburg | 2008-05-13 15:10:45 -0400 (Tue, 13 May 2008) | 3 lines
Remove leftovers from reverted setuptools checkin (they were added in r45525).
........
r63211 | georg.brandl | 2008-05-13 17:32:03 -0400 (Tue, 13 May 2008) | 2 lines
Fix a refleak in the _warnings module.
........
r63212 | andrew.kuchling | 2008-05-13 20:46:41 -0400 (Tue, 13 May 2008) | 1 line
List all the removes and renamed modules
........
r63214 | brett.cannon | 2008-05-13 21:09:40 -0400 (Tue, 13 May 2008) | 2 lines
Rewrap some lines in test_py3kwarn.
........
r63219 | georg.brandl | 2008-05-14 02:34:15 -0400 (Wed, 14 May 2008) | 2 lines
Add NEWS entry for #2831.
........
r63220 | neal.norwitz | 2008-05-14 02:47:56 -0400 (Wed, 14 May 2008) | 3 lines
Fix "refleak" by restoring the tearDown method removed by accident (AFAICT)
in r62788.
........
r63221 | georg.brandl | 2008-05-14 03:18:22 -0400 (Wed, 14 May 2008) | 2 lines
Fix another "refleak" by clearing the filters after test.
........
r63222 | neal.norwitz | 2008-05-14 03:21:42 -0400 (Wed, 14 May 2008) | 5 lines
Install the json package and tests as well as the lib2to3 tests
so the tests work when run from an install directory.
They are currently skipped on the daily runs (not from the buildbots)
for checking refleaks, etc.
........
r63256 | andrew.kuchling | 2008-05-14 21:10:24 -0400 (Wed, 14 May 2008) | 1 line
Note some removals and a rename
........
r63311 | brett.cannon | 2008-05-15 00:36:53 -0400 (Thu, 15 May 2008) | 2 lines
Add a snippet for the deprecation directive for docs.
........
r63313 | gregory.p.smith | 2008-05-15 00:56:18 -0400 (Thu, 15 May 2008) | 5 lines
disable the crashing test. I will also file a bug. This crash does
not appear to be a new bug, its just that the test coverage went up
recently exposing it. (I verified that by testing this test code on
an older Modules/_bsddb.c)
........
r63320 | georg.brandl | 2008-05-15 11:08:32 -0400 (Thu, 15 May 2008) | 2 lines
#2863: add gen.__name__ and add this name to generator repr().
........
r63324 | andrew.kuchling | 2008-05-15 16:07:39 -0400 (Thu, 15 May 2008) | 1 line
Import class from distutils.cmd, not .core, to avoid circular import
........
r63327 | alexandre.vassalotti | 2008-05-15 16:31:42 -0400 (Thu, 15 May 2008) | 2 lines
Fixed typo in a doctest of test_genexps.
........
r63332 | benjamin.peterson | 2008-05-15 18:34:33 -0400 (Thu, 15 May 2008) | 2 lines
add Mac modules to the list of deprecated ones
........
r63333 | benjamin.peterson | 2008-05-15 18:41:16 -0400 (Thu, 15 May 2008) | 2 lines
fix typos in whatsnew
........
r63348 | benjamin.peterson | 2008-05-15 22:24:49 -0400 (Thu, 15 May 2008) | 2 lines
make test_platform a bit more assertive (We'll see what the buildbots say.)
........
2008-05-16 06:39:54 +02:00
|
|
|
static PyObject *
|
|
|
|
gen_repr(PyGenObject *gen)
|
|
|
|
{
|
2010-05-09 17:52:27 +02:00
|
|
|
return PyUnicode_FromFormat("<generator object %S at %p>",
|
|
|
|
((PyCodeObject *)gen->gi_code)->co_name,
|
|
|
|
gen);
|
Merged revisions 63208-63209,63211-63212,63214-63217,63219-63224,63226-63227,63229-63232,63234-63235,63237-63239,63241,63243-63246,63250-63254,63256-63259,63261,63263-63264,63266-63267,63269-63270,63272-63273,63275-63276,63278,63280-63281,63283-63284,63286-63287,63289-63290,63292-63293,63295-63296,63298-63299,63301-63302,63304-63305,63307,63309-63314,63316-63322,63324-63325,63327-63335,63337-63338,63340-63342,63344-63346,63348 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63208 | georg.brandl | 2008-05-13 15:04:54 -0400 (Tue, 13 May 2008) | 2 lines
#2831: add start argument to enumerate(). Patch by Scott Dial and me.
........
r63209 | marc-andre.lemburg | 2008-05-13 15:10:45 -0400 (Tue, 13 May 2008) | 3 lines
Remove leftovers from reverted setuptools checkin (they were added in r45525).
........
r63211 | georg.brandl | 2008-05-13 17:32:03 -0400 (Tue, 13 May 2008) | 2 lines
Fix a refleak in the _warnings module.
........
r63212 | andrew.kuchling | 2008-05-13 20:46:41 -0400 (Tue, 13 May 2008) | 1 line
List all the removes and renamed modules
........
r63214 | brett.cannon | 2008-05-13 21:09:40 -0400 (Tue, 13 May 2008) | 2 lines
Rewrap some lines in test_py3kwarn.
........
r63219 | georg.brandl | 2008-05-14 02:34:15 -0400 (Wed, 14 May 2008) | 2 lines
Add NEWS entry for #2831.
........
r63220 | neal.norwitz | 2008-05-14 02:47:56 -0400 (Wed, 14 May 2008) | 3 lines
Fix "refleak" by restoring the tearDown method removed by accident (AFAICT)
in r62788.
........
r63221 | georg.brandl | 2008-05-14 03:18:22 -0400 (Wed, 14 May 2008) | 2 lines
Fix another "refleak" by clearing the filters after test.
........
r63222 | neal.norwitz | 2008-05-14 03:21:42 -0400 (Wed, 14 May 2008) | 5 lines
Install the json package and tests as well as the lib2to3 tests
so the tests work when run from an install directory.
They are currently skipped on the daily runs (not from the buildbots)
for checking refleaks, etc.
........
r63256 | andrew.kuchling | 2008-05-14 21:10:24 -0400 (Wed, 14 May 2008) | 1 line
Note some removals and a rename
........
r63311 | brett.cannon | 2008-05-15 00:36:53 -0400 (Thu, 15 May 2008) | 2 lines
Add a snippet for the deprecation directive for docs.
........
r63313 | gregory.p.smith | 2008-05-15 00:56:18 -0400 (Thu, 15 May 2008) | 5 lines
disable the crashing test. I will also file a bug. This crash does
not appear to be a new bug, its just that the test coverage went up
recently exposing it. (I verified that by testing this test code on
an older Modules/_bsddb.c)
........
r63320 | georg.brandl | 2008-05-15 11:08:32 -0400 (Thu, 15 May 2008) | 2 lines
#2863: add gen.__name__ and add this name to generator repr().
........
r63324 | andrew.kuchling | 2008-05-15 16:07:39 -0400 (Thu, 15 May 2008) | 1 line
Import class from distutils.cmd, not .core, to avoid circular import
........
r63327 | alexandre.vassalotti | 2008-05-15 16:31:42 -0400 (Thu, 15 May 2008) | 2 lines
Fixed typo in a doctest of test_genexps.
........
r63332 | benjamin.peterson | 2008-05-15 18:34:33 -0400 (Thu, 15 May 2008) | 2 lines
add Mac modules to the list of deprecated ones
........
r63333 | benjamin.peterson | 2008-05-15 18:41:16 -0400 (Thu, 15 May 2008) | 2 lines
fix typos in whatsnew
........
r63348 | benjamin.peterson | 2008-05-15 22:24:49 -0400 (Thu, 15 May 2008) | 2 lines
make test_platform a bit more assertive (We'll see what the buildbots say.)
........
2008-05-16 06:39:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
gen_get_name(PyGenObject *gen)
|
|
|
|
{
|
2010-05-09 17:52:27 +02:00
|
|
|
PyObject *name = ((PyCodeObject *)gen->gi_code)->co_name;
|
|
|
|
Py_INCREF(name);
|
|
|
|
return name;
|
Merged revisions 63208-63209,63211-63212,63214-63217,63219-63224,63226-63227,63229-63232,63234-63235,63237-63239,63241,63243-63246,63250-63254,63256-63259,63261,63263-63264,63266-63267,63269-63270,63272-63273,63275-63276,63278,63280-63281,63283-63284,63286-63287,63289-63290,63292-63293,63295-63296,63298-63299,63301-63302,63304-63305,63307,63309-63314,63316-63322,63324-63325,63327-63335,63337-63338,63340-63342,63344-63346,63348 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63208 | georg.brandl | 2008-05-13 15:04:54 -0400 (Tue, 13 May 2008) | 2 lines
#2831: add start argument to enumerate(). Patch by Scott Dial and me.
........
r63209 | marc-andre.lemburg | 2008-05-13 15:10:45 -0400 (Tue, 13 May 2008) | 3 lines
Remove leftovers from reverted setuptools checkin (they were added in r45525).
........
r63211 | georg.brandl | 2008-05-13 17:32:03 -0400 (Tue, 13 May 2008) | 2 lines
Fix a refleak in the _warnings module.
........
r63212 | andrew.kuchling | 2008-05-13 20:46:41 -0400 (Tue, 13 May 2008) | 1 line
List all the removes and renamed modules
........
r63214 | brett.cannon | 2008-05-13 21:09:40 -0400 (Tue, 13 May 2008) | 2 lines
Rewrap some lines in test_py3kwarn.
........
r63219 | georg.brandl | 2008-05-14 02:34:15 -0400 (Wed, 14 May 2008) | 2 lines
Add NEWS entry for #2831.
........
r63220 | neal.norwitz | 2008-05-14 02:47:56 -0400 (Wed, 14 May 2008) | 3 lines
Fix "refleak" by restoring the tearDown method removed by accident (AFAICT)
in r62788.
........
r63221 | georg.brandl | 2008-05-14 03:18:22 -0400 (Wed, 14 May 2008) | 2 lines
Fix another "refleak" by clearing the filters after test.
........
r63222 | neal.norwitz | 2008-05-14 03:21:42 -0400 (Wed, 14 May 2008) | 5 lines
Install the json package and tests as well as the lib2to3 tests
so the tests work when run from an install directory.
They are currently skipped on the daily runs (not from the buildbots)
for checking refleaks, etc.
........
r63256 | andrew.kuchling | 2008-05-14 21:10:24 -0400 (Wed, 14 May 2008) | 1 line
Note some removals and a rename
........
r63311 | brett.cannon | 2008-05-15 00:36:53 -0400 (Thu, 15 May 2008) | 2 lines
Add a snippet for the deprecation directive for docs.
........
r63313 | gregory.p.smith | 2008-05-15 00:56:18 -0400 (Thu, 15 May 2008) | 5 lines
disable the crashing test. I will also file a bug. This crash does
not appear to be a new bug, its just that the test coverage went up
recently exposing it. (I verified that by testing this test code on
an older Modules/_bsddb.c)
........
r63320 | georg.brandl | 2008-05-15 11:08:32 -0400 (Thu, 15 May 2008) | 2 lines
#2863: add gen.__name__ and add this name to generator repr().
........
r63324 | andrew.kuchling | 2008-05-15 16:07:39 -0400 (Thu, 15 May 2008) | 1 line
Import class from distutils.cmd, not .core, to avoid circular import
........
r63327 | alexandre.vassalotti | 2008-05-15 16:31:42 -0400 (Thu, 15 May 2008) | 2 lines
Fixed typo in a doctest of test_genexps.
........
r63332 | benjamin.peterson | 2008-05-15 18:34:33 -0400 (Thu, 15 May 2008) | 2 lines
add Mac modules to the list of deprecated ones
........
r63333 | benjamin.peterson | 2008-05-15 18:41:16 -0400 (Thu, 15 May 2008) | 2 lines
fix typos in whatsnew
........
r63348 | benjamin.peterson | 2008-05-15 22:24:49 -0400 (Thu, 15 May 2008) | 2 lines
make test_platform a bit more assertive (We'll see what the buildbots say.)
........
2008-05-16 06:39:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
PyDoc_STRVAR(gen__name__doc__,
|
|
|
|
"Return the name of the generator's associated code object.");
|
|
|
|
|
|
|
|
static PyGetSetDef gen_getsetlist[] = {
|
2010-05-09 17:52:27 +02:00
|
|
|
{"__name__", (getter)gen_get_name, NULL, gen__name__doc__},
|
|
|
|
{NULL}
|
Merged revisions 63208-63209,63211-63212,63214-63217,63219-63224,63226-63227,63229-63232,63234-63235,63237-63239,63241,63243-63246,63250-63254,63256-63259,63261,63263-63264,63266-63267,63269-63270,63272-63273,63275-63276,63278,63280-63281,63283-63284,63286-63287,63289-63290,63292-63293,63295-63296,63298-63299,63301-63302,63304-63305,63307,63309-63314,63316-63322,63324-63325,63327-63335,63337-63338,63340-63342,63344-63346,63348 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63208 | georg.brandl | 2008-05-13 15:04:54 -0400 (Tue, 13 May 2008) | 2 lines
#2831: add start argument to enumerate(). Patch by Scott Dial and me.
........
r63209 | marc-andre.lemburg | 2008-05-13 15:10:45 -0400 (Tue, 13 May 2008) | 3 lines
Remove leftovers from reverted setuptools checkin (they were added in r45525).
........
r63211 | georg.brandl | 2008-05-13 17:32:03 -0400 (Tue, 13 May 2008) | 2 lines
Fix a refleak in the _warnings module.
........
r63212 | andrew.kuchling | 2008-05-13 20:46:41 -0400 (Tue, 13 May 2008) | 1 line
List all the removes and renamed modules
........
r63214 | brett.cannon | 2008-05-13 21:09:40 -0400 (Tue, 13 May 2008) | 2 lines
Rewrap some lines in test_py3kwarn.
........
r63219 | georg.brandl | 2008-05-14 02:34:15 -0400 (Wed, 14 May 2008) | 2 lines
Add NEWS entry for #2831.
........
r63220 | neal.norwitz | 2008-05-14 02:47:56 -0400 (Wed, 14 May 2008) | 3 lines
Fix "refleak" by restoring the tearDown method removed by accident (AFAICT)
in r62788.
........
r63221 | georg.brandl | 2008-05-14 03:18:22 -0400 (Wed, 14 May 2008) | 2 lines
Fix another "refleak" by clearing the filters after test.
........
r63222 | neal.norwitz | 2008-05-14 03:21:42 -0400 (Wed, 14 May 2008) | 5 lines
Install the json package and tests as well as the lib2to3 tests
so the tests work when run from an install directory.
They are currently skipped on the daily runs (not from the buildbots)
for checking refleaks, etc.
........
r63256 | andrew.kuchling | 2008-05-14 21:10:24 -0400 (Wed, 14 May 2008) | 1 line
Note some removals and a rename
........
r63311 | brett.cannon | 2008-05-15 00:36:53 -0400 (Thu, 15 May 2008) | 2 lines
Add a snippet for the deprecation directive for docs.
........
r63313 | gregory.p.smith | 2008-05-15 00:56:18 -0400 (Thu, 15 May 2008) | 5 lines
disable the crashing test. I will also file a bug. This crash does
not appear to be a new bug, its just that the test coverage went up
recently exposing it. (I verified that by testing this test code on
an older Modules/_bsddb.c)
........
r63320 | georg.brandl | 2008-05-15 11:08:32 -0400 (Thu, 15 May 2008) | 2 lines
#2863: add gen.__name__ and add this name to generator repr().
........
r63324 | andrew.kuchling | 2008-05-15 16:07:39 -0400 (Thu, 15 May 2008) | 1 line
Import class from distutils.cmd, not .core, to avoid circular import
........
r63327 | alexandre.vassalotti | 2008-05-15 16:31:42 -0400 (Thu, 15 May 2008) | 2 lines
Fixed typo in a doctest of test_genexps.
........
r63332 | benjamin.peterson | 2008-05-15 18:34:33 -0400 (Thu, 15 May 2008) | 2 lines
add Mac modules to the list of deprecated ones
........
r63333 | benjamin.peterson | 2008-05-15 18:41:16 -0400 (Thu, 15 May 2008) | 2 lines
fix typos in whatsnew
........
r63348 | benjamin.peterson | 2008-05-15 22:24:49 -0400 (Thu, 15 May 2008) | 2 lines
make test_platform a bit more assertive (We'll see what the buildbots say.)
........
2008-05-16 06:39:54 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-06-01 17:22:42 +02:00
|
|
|
static PyMemberDef gen_memberlist[] = {
|
2010-05-09 17:52:27 +02:00
|
|
|
{"gi_frame", T_OBJECT, offsetof(PyGenObject, gi_frame), READONLY},
|
2012-03-08 01:17:03 +01:00
|
|
|
{"gi_running", T_BOOL, offsetof(PyGenObject, gi_running), READONLY},
|
2010-05-09 17:52:27 +02:00
|
|
|
{"gi_code", T_OBJECT, offsetof(PyGenObject, gi_code), READONLY},
|
|
|
|
{NULL} /* Sentinel */
|
2004-06-01 17:22:42 +02:00
|
|
|
};
|
|
|
|
|
2005-08-02 02:46:46 +02:00
|
|
|
static PyMethodDef gen_methods[] = {
|
2012-03-15 21:37:39 +01:00
|
|
|
{"send",(PyCFunction)_PyGen_Send, METH_O, send_doc},
|
2010-05-09 17:52:27 +02:00
|
|
|
{"throw",(PyCFunction)gen_throw, METH_VARARGS, throw_doc},
|
|
|
|
{"close",(PyCFunction)gen_close, METH_NOARGS, close_doc},
|
|
|
|
{NULL, NULL} /* Sentinel */
|
2005-08-02 02:46:46 +02:00
|
|
|
};
|
|
|
|
|
2004-06-01 17:22:42 +02:00
|
|
|
PyTypeObject PyGen_Type = {
|
2010-05-09 17:52:27 +02:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"generator", /* tp_name */
|
|
|
|
sizeof(PyGenObject), /* tp_basicsize */
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
|
|
|
(destructor)gen_dealloc, /* tp_dealloc */
|
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_reserved */
|
|
|
|
(reprfunc)gen_repr, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
2013-07-30 19:59:21 +02:00
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
|
|
|
|
Py_TPFLAGS_HAVE_FINALIZE, /* tp_flags */
|
2010-05-09 17:52:27 +02:00
|
|
|
0, /* tp_doc */
|
|
|
|
(traverseproc)gen_traverse, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
offsetof(PyGenObject, gi_weakreflist), /* tp_weaklistoffset */
|
|
|
|
PyObject_SelfIter, /* tp_iter */
|
|
|
|
(iternextfunc)gen_iternext, /* tp_iternext */
|
|
|
|
gen_methods, /* tp_methods */
|
|
|
|
gen_memberlist, /* tp_members */
|
|
|
|
gen_getsetlist, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
0, /* tp_init */
|
|
|
|
0, /* tp_alloc */
|
|
|
|
0, /* tp_new */
|
|
|
|
0, /* tp_free */
|
|
|
|
0, /* tp_is_gc */
|
|
|
|
0, /* tp_bases */
|
|
|
|
0, /* tp_mro */
|
|
|
|
0, /* tp_cache */
|
|
|
|
0, /* tp_subclasses */
|
|
|
|
0, /* tp_weaklist */
|
2013-07-30 19:59:21 +02:00
|
|
|
0, /* tp_del */
|
|
|
|
0, /* tp_version_tag */
|
2013-08-05 23:26:40 +02:00
|
|
|
_PyGen_Finalize, /* tp_finalize */
|
2004-06-01 17:22:42 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
PyObject *
|
|
|
|
PyGen_New(PyFrameObject *f)
|
|
|
|
{
|
2010-05-09 17:52:27 +02:00
|
|
|
PyGenObject *gen = PyObject_GC_New(PyGenObject, &PyGen_Type);
|
|
|
|
if (gen == NULL) {
|
|
|
|
Py_DECREF(f);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
gen->gi_frame = f;
|
2013-08-05 23:26:40 +02:00
|
|
|
f->f_gen = (PyObject *) gen;
|
2010-05-09 17:52:27 +02:00
|
|
|
Py_INCREF(f->f_code);
|
|
|
|
gen->gi_code = (PyObject *)(f->f_code);
|
|
|
|
gen->gi_running = 0;
|
|
|
|
gen->gi_weakreflist = NULL;
|
|
|
|
_PyObject_GC_TRACK(gen);
|
|
|
|
return (PyObject *)gen;
|
2004-06-01 17:22:42 +02:00
|
|
|
}
|
2006-04-21 12:40:58 +02:00
|
|
|
|
|
|
|
int
|
|
|
|
PyGen_NeedsFinalizing(PyGenObject *gen)
|
|
|
|
{
|
2013-05-14 20:37:52 +02:00
|
|
|
int i;
|
|
|
|
PyFrameObject *f = gen->gi_frame;
|
|
|
|
|
|
|
|
if (f == NULL || f->f_stacktop == NULL)
|
|
|
|
return 0; /* no frame or empty blockstack == no finalization */
|
|
|
|
|
|
|
|
/* Any block type besides a loop requires cleanup. */
|
|
|
|
for (i = 0; i < f->f_iblock; i++)
|
|
|
|
if (f->f_blockstack[i].b_type != SETUP_LOOP)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* No blocks except loops, it's safe to skip finalization. */
|
2010-05-09 17:52:27 +02:00
|
|
|
return 0;
|
2006-04-21 12:40:58 +02:00
|
|
|
}
|