mirror of https://github.com/python/cpython
Issue #29513: Fix outdated comment and remove redundand code is os.scandir().
This commit is contained in:
parent
c7a24a7330
commit
095ef73492
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue