diff -r 77d24f51effc Modules/posixmodule.c
--- a/Modules/posixmodule.c	Tue Jan 12 06:18:32 2016 -0800
+++ b/Modules/posixmodule.c	Wed Jan 13 16:24:58 2016 +0200
@@ -11954,12 +11954,11 @@ ScandirIterator_iternext(ScandirIterator
 {
 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) {
@@ -11967,9 +11966,9 @@ ScandirIterator_iternext(ScandirIterator
 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;
 }
 }
@@ -11977,15 +11976,17 @@ ScandirIterator_iternext(ScandirIterator
 
 /* 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 */
 }
 
 ScandirIterator_close(iterator);
-
- PyErr_SetNone(PyExc_StopIteration);
 return NULL;
 }
 
@@ -12010,12 +12011,11 @@ ScandirIterator_iternext(ScandirIterator
 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;
@@ -12024,9 +12024,9 @@ ScandirIterator_iternext(ScandirIterator
 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;
 }
 
@@ -12035,20 +12035,21 @@ ScandirIterator_iternext(ScandirIterator
 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 */
 }
 
 ScandirIterator_close(iterator);
-
- PyErr_SetNone(PyExc_StopIteration);
 return NULL;
 }
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file41616/scandir_closedir_on_error.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file41616/scandir_closedir_on_error.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>