[Python-checkins] cpython: Backed out changeset 36f2e236c601: For some reason, rewinddir() doesn't work as

Sun Jan 8 20:31:15 CET 2012

http://hg.python.org/cpython/rev/c14c60628714
changeset: 74304:c14c60628714
user: Charles-François Natali <neologix at free.fr>
date: Sun Jan 08 20:30:47 2012 +0100
summary:
 Backed out changeset 36f2e236c601: For some reason, rewinddir() doesn't work as
it should on OpenIndiana.
files:
 Modules/posixmodule.c | 3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -2890,7 +2890,6 @@
 close(fd);
 return posix_error();
 }
- rewinddir(dirp);
 if ((d = PyList_New(0)) == NULL) {
 Py_BEGIN_ALLOW_THREADS
 closedir(dirp);
@@ -2907,6 +2906,7 @@
 break;
 } else {
 Py_BEGIN_ALLOW_THREADS
+ rewinddir(dirp);
 closedir(dirp);
 Py_END_ALLOW_THREADS
 Py_DECREF(d);
@@ -2930,6 +2930,7 @@
 Py_DECREF(v);
 }
 Py_BEGIN_ALLOW_THREADS
+ rewinddir(dirp);
 closedir(dirp);
 Py_END_ALLOW_THREADS
 
-- 
Repository URL: http://hg.python.org/cpython
