Commit b73caab4 authored by Antoine Pitrou's avatar Antoine Pitrou

Issue #6915: Under Windows, os.listdir() didn't release the Global

Interpreter Lock around all system calls.  Original patch by Ryan Kelly.
parent 5af4f4b9
......@@ -419,6 +419,7 @@ Jacob Kaplan-Moss
Lou Kates
Hiroaki Kawai
Sebastien Keim
Ryan Kelly
Robert Kern
Randall Kern
Magnus Kessler
......
......@@ -30,6 +30,9 @@ Core and Builtins
Extensions
----------
- Issue #6915: Under Windows, os.listdir() didn't release the Global
Interpreter Lock around all system calls. Original patch by Ryan Kelly.
- Issue #8524: Add a detach() method to socket objects, so as to put the
socket into the closed state without closing the underlying file
descriptor.
......
......@@ -1229,7 +1229,7 @@ win32_stat_w(const wchar_t* path, struct win32_stat *result)
/* FILE_FLAG_BACKUP_SEMANTICS is required to open a directory */
FILE_ATTRIBUTE_NORMAL|FILE_FLAG_BACKUP_SEMANTICS,
NULL);
if(hFile == INVALID_HANDLE_VALUE) {
/* Either the target doesn't exist, or we don't have access to
get a handle to it. If the former, we need to return an error.
......@@ -2353,7 +2353,9 @@ posix_listdir(PyObject *self, PyObject *args)
free(wnamebuf);
return NULL;
}
Py_BEGIN_ALLOW_THREADS
hFindFile = FindFirstFileW(wnamebuf, &wFileData);
Py_END_ALLOW_THREADS
if (hFindFile == INVALID_HANDLE_VALUE) {
int error = GetLastError();
if (error == ERROR_FILE_NOT_FOUND) {
......@@ -2430,7 +2432,9 @@ posix_listdir(PyObject *self, PyObject *args)
if ((d = PyList_New(0)) == NULL)
return NULL;
Py_BEGIN_ALLOW_THREADS
hFindFile = FindFirstFile(namebuf, &FileData);
Py_END_ALLOW_THREADS
if (hFindFile == INVALID_HANDLE_VALUE) {
int error = GetLastError();
if (error == ERROR_FILE_NOT_FOUND)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment