(original) (raw)

changeset: 100188:8ec721bb3027 branch: 3.5 parent: 100185:5310f94772f4 user: Serhiy Storchaka storchaka@gmail.com date: Mon Feb 08 17:56:36 2016 +0200 files: Misc/NEWS Modules/posixmodule.c description: Issue #26117: The os.scandir() iterator now closes file descriptor not only when the iteration is finished, but when it was failed with error. diff -r 5310f94772f4 -r 8ec721bb3027 Misc/NEWS --- a/Misc/NEWS Mon Feb 08 16:23:28 2016 +0200 +++ b/Misc/NEWS Mon Feb 08 17:56:36 2016 +0200 @@ -73,6 +73,9 @@ Library ------- +- Issue #26117: The os.scandir() iterator now closes file descriptor not only + when the iteration is finished, but when it was failed with error. + - Issue #25911: Restored support of bytes paths in os.walk() on Windows. - Issue #26045: Add UTF-8 suggestion to error message when posting a diff -r 5310f94772f4 -r 8ec721bb3027 Modules/posixmodule.c --- a/Modules/posixmodule.c Mon Feb 08 16:23:28 2016 +0200 +++ b/Modules/posixmodule.c Mon Feb 08 17:56:36 2016 +0200 @@ -11942,12 +11942,11 @@ { WIN32_FIND_DATAW *file_data = &iterator->file_data; BOOL success; + PyObject *entry; /* Happens if the iterator is iterated twice */ - if (iterator->handle == INVALID_HANDLE_VALUE) { - PyErr_SetNone(PyExc_StopIteration); - return NULL; - } + if (iterator->handle == INVALID_HANDLE_VALUE) + return NULL; while (1) { if (!iterator->first_time) { @@ -11955,9 +11954,9 @@ success = FindNextFileW(iterator->handle, file_data); Py_END_ALLOW_THREADS if (!success) { + /* Error or no more files */ if (GetLastError() != ERROR_NO_MORE_FILES) - return path_error(&iterator->path); - /* No more files found in directory, stop iterating */ + path_error(&iterator->path); break; } } @@ -11965,15 +11964,18 @@ /* Skip over . and .. */ if (wcscmp(file_data->cFileName, L".") != 0 && - wcscmp(file_data->cFileName, L"..") != 0) - return DirEntry_from_find_data(&iterator->path, file_data); + wcscmp(file_data->cFileName, L"..") != 0) { + entry = DirEntry_from_find_data(&iterator->path, file_data); + if (!entry) + break; + return entry; + } /* Loop till we get a non-dot directory or finish iterating */ } + /* Error or no more files */ ScandirIterator_close(iterator); - - PyErr_SetNone(PyExc_StopIteration); return NULL; } @@ -11998,12 +12000,11 @@ struct dirent *direntp; Py_ssize_t name_len; int is_dot; + PyObject *entry; /* Happens if the iterator is iterated twice */ - if (!iterator->dirp) { - PyErr_SetNone(PyExc_StopIteration); - return NULL; - } + if (!iterator->dirp) + return NULL; while (1) { errno = 0; @@ -12012,9 +12013,9 @@ Py_END_ALLOW_THREADS if (!direntp) { + /* Error or no more files */ if (errno != 0) - return path_error(&iterator->path); - /* No more files found in directory, stop iterating */ + path_error(&iterator->path); break; } @@ -12023,20 +12024,22 @@ is_dot = direntp->d_name[0] == '.' && (name_len == 1 || (direntp->d_name[1] == '.' && name_len == 2)); if (!is_dot) { - return DirEntry_from_posix_info(&iterator->path, direntp->d_name, + entry = DirEntry_from_posix_info(&iterator->path, direntp->d_name, name_len, direntp->d_ino #ifdef HAVE_DIRENT_D_TYPE , direntp->d_type #endif ); + if (!entry) + break; + return entry; } /* Loop till we get a non-dot directory or finish iterating */ } + /* Error or no more files */ ScandirIterator_close(iterator); - - PyErr_SetNone(PyExc_StopIteration); return NULL; } /storchaka@gmail.com