changeset: 75491:6c218b9c5c4c
branch: 2.7
user: Jason R. Coombs <jaraco@jaraco.com>
date: Fri Jan 13 17:37:18 2012 -0500
files: Python/import.c
description:
Extracted Windows directory detection from NullImporter.__init__. This greatly simplifies the code and fixes issue6727.
diff -r 2218a6cf75fc -r 6c218b9c5c4c Python/import.c
--- a/Python/import.c	Fri Jan 13 17:12:25 2012 -0500
+++ b/Python/import.c	Fri Jan 13 17:37:18 2012 -0500
@@ -114,19 +114,34 @@
 };
 #endif
 
-#ifdef HAVE_STAT
+#ifdef MS_WINDOWS
+int isdir(char *path) {
+	DWORD rv;
+	/* see issue1293 and issue3677:
+	 * stat() on Windows doesn't recognise paths like
+	 * "e:\\shared\\" and "\\\\whiterab-c2znlh\\shared" as dirs.
+	 * Also reference issue6727:
+	 * stat() on Windows is broken and doesn't resolve symlinks properly.
+	 */
+	rv = GetFileAttributesA(path);
+	return rv != INVALID_FILE_ATTRIBUTES && rv & FILE_ATTRIBUTE_DIRECTORY;
+}
+#else
+#if HAVE_STAT
 int isdir(char *path) {
 struct stat statbuf;
 	return stat(path, &statbuf) == 0 && S_ISDIR(statbuf.st_mode);
 }
 #else
+#ifdef RISCOS
 /* with RISCOS, isdir is in unixstuff */
-#ifndef RISCOS
+#else
 int isdir(char *path) {
 	return 0;
 }
-#endif
-#endif
+#endif /* RISCOS */
+#endif /* HAVE_STAT */
+#endif /* MS_WINDOWS */
 
 /* Initialize things */
 
@@ -3185,49 +3200,11 @@
 PyErr_SetString(PyExc_ImportError, "empty pathname");
 return -1;
 } else {
-#ifndef RISCOS
-#ifndef MS_WINDOWS
- struct stat statbuf;
- int rv;
-
- rv = stat(path, &statbuf);
- if (rv == 0) {
- /* it exists */
- if (S_ISDIR(statbuf.st_mode)) {
- /* it's a directory */
- PyErr_SetString(PyExc_ImportError,
- "existing directory");
- return -1;
- }
- }
-#else /* MS_WINDOWS */
- DWORD rv;
- /* see issue1293 and issue3677:
- * stat() on Windows doesn't recognise paths like
- * "e:\\shared\\" and "\\\\whiterab-c2znlh\\shared" as dirs.
- */
- rv = GetFileAttributesA(path);
- if (rv != INVALID_FILE_ATTRIBUTES) {
- /* it exists */
- if (rv & FILE_ATTRIBUTE_DIRECTORY) {
- /* it's a directory */
- PyErr_SetString(PyExc_ImportError,
- "existing directory");
- return -1;
- }
- }
-#endif
-#else /* RISCOS */
- if (object_exists(path)) {
- /* it exists */
- if (isdir(path)) {
- /* it's a directory */
- PyErr_SetString(PyExc_ImportError,
- "existing directory");
- return -1;
- }
- }
-#endif
+		if(isdir(path)) {
+			PyErr_SetString(PyExc_ImportError,
+							"existing directory");
+			return -1;
+		}
 }
 return 0;
 }
</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://hg.python.org/cpython/rev/6c218b9c5c4c">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/6c218b9c5c4c" 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>