diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 91902363649..985915f09d5 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -810,7 +810,7 @@ static PyObject * tee(PyObject *self, PyObject *args) { Py_ssize_t i, n=2; - PyObject *it, *iterable, *copyable, *result; + PyObject *it, *iterable, *copyable, *copyfunc, *result; _Py_IDENTIFIER(__copy__); if (!PyArg_ParseTuple(args, "O|n", &iterable, &n)) @@ -829,25 +829,43 @@ tee(PyObject *self, PyObject *args) Py_DECREF(result); return NULL; } - if (!_PyObject_HasAttrId(it, &PyId___copy__)) { + + copyfunc = _PyObject_GetAttrId(it, &PyId___copy__); + if (copyfunc != NULL) { + copyable = it; + } + else if (!PyErr_ExceptionMatches(PyExc_AttributeError)) { + Py_DECREF(it); + Py_DECREF(result); + return NULL; + } + else { + PyErr_Clear(); copyable = tee_fromiterable(it); Py_DECREF(it); if (copyable == NULL) { Py_DECREF(result); return NULL; } - } else - copyable = it; - PyTuple_SET_ITEM(result, 0, copyable); - for (i=1 ; i