From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 3 Dec 2007 23:09:04 +0000 (+0000)
Subject: Forward-port r59310:
X-Git-Tag: v2.6a1~946
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b3cc06a9a26e38f379ac802e857a463970e35fa;p=python

Forward-port r59310:
os.access now returns True on Windows for any existing directory.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 4c3369c7e6..9cdcbc25c2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -310,6 +310,8 @@ Core and builtins
 Library
 -------
 
+- os.access now returns True on Windows for any existing directory.
+
 - Issue #1727780: Support loading pickles of random.Random objects created
   on 32-bit systems on 64-bit systems, and vice versa. As a consequence
   of the change, Random pickles created by Python 2.6 cannot be loaded
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index ff79a0e8fa..df1586068e 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1540,8 +1540,11 @@ finish:
 		/* File does not exist, or cannot read attributes */
 		return PyBool_FromLong(0);
 	/* Access is possible if either write access wasn't requested, or
-	   the file isn't read-only. */
-	return PyBool_FromLong(!(mode & 2) || !(attr & FILE_ATTRIBUTE_READONLY));
+	   the file isn't read-only, or if it's a directory, as there are
+	   no read-only directories on Windows. */
+	return PyBool_FromLong(!(mode & 2) 
+	                       || !(attr & FILE_ATTRIBUTE_READONLY)
+			       || (attr & FILE_ATTRIBUTE_DIRECTORY));
 #else
 	int res;
 	if (!PyArg_ParseTuple(args, "eti:access",