From 095ef73492f2efba3a3ebd8a0957ba2b8fcad013 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 9 Feb 2017 20:05:51 +0200 Subject: Issue #29513: Fix outdated comment and remove redundand code is os.scandir(). --- Modules/posixmodule.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 48c3c7a..ffe4815 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -11856,7 +11856,6 @@ ScandirIterator_finalize(ScandirIterator *iterator) } } - Py_CLEAR(iterator->path.object); path_cleanup(&iterator->path); /* Restore the saved exception. */ @@ -11968,12 +11967,9 @@ os_scandir_impl(PyObject *module, path_t *path) #endif memcpy(&iterator->path, path, sizeof(path_t)); - /* path_converter doesn't keep path.object around, so do it - manually for the lifetime of the iterator here (the refcount - is decremented in ScandirIterator_dealloc) - */ - Py_XINCREF(iterator->path.object); - Py_XINCREF(iterator->path.cleanup); + /* Move the ownership to iterator->path */ + path->object = NULL; + path->cleanup = NULL; #ifdef MS_WINDOWS iterator->first_time = 1; -- cgit v0.12