diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2011-09-01 19:37:43 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-09-01 19:37:43 (GMT) |
commit | a762285831d1591d5c621394f8f6be45688ba33d (patch) | |
tree | 5e24a13489617c5f68dede866921bcc92b46e4d1 | |
parent | 222b20844f28f37dbe5431eb293ef2b35df71ae7 (diff) | |
download | cpython-a762285831d1591d5c621394f8f6be45688ba33d.zip cpython-a762285831d1591d5c621394f8f6be45688ba33d.tar.gz cpython-a762285831d1591d5c621394f8f6be45688ba33d.tar.bz2 |
Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now
mapped to POSIX errno ENOTDIR (previously EINVAL).
-rw-r--r-- | Lib/test/test_exceptions.py | 8 | ||||
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rw-r--r-- | PC/errmap.h | 1 | ||||
-rw-r--r-- | PC/generrmap.c | 21 |
4 files changed, 27 insertions, 6 deletions
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py index d3c0062..0a7ddd4 100644 --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -5,6 +5,7 @@ import sys import unittest import pickle import weakref +import errno from test.support import (TESTFN, unlink, run_unittest, captured_output, gc_collect, cpython_only) @@ -849,6 +850,13 @@ class ExceptionTests(unittest.TestCase): self.fail("RuntimeError not raised") self.assertEqual(wr(), None) + def test_errno_ENOTDIR(self): + # Issue #12802: "not a directory" errors are ENOTDIR even on Windows + with self.assertRaises(OSError) as cm: + os.listdir(__file__) + self.assertEqual(cm.exception.errno, errno.ENOTDIR, cm.exception) + + def test_main(): run_unittest(ExceptionTests) @@ -10,6 +10,9 @@ What's New in Python 3.2.3? Core and Builtins ----------------- +- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now + mapped to POSIX errno ENOTDIR (previously EINVAL). + - Accept bytes for the AST string type. This is temporary until a proper fix in 3.3. diff --git a/PC/errmap.h b/PC/errmap.h index d225aa4..8dde31c 100644 --- a/PC/errmap.h +++ b/PC/errmap.h @@ -72,6 +72,7 @@ int winerror_to_errno(int winerror) case 202: return 8; case 206: return 2; case 215: return 11; + case 267: return 20; case 1816: return 12; default: return EINVAL; } diff --git a/PC/generrmap.c b/PC/generrmap.c index bf1081b..0323cd4 100644 --- a/PC/generrmap.c +++ b/PC/generrmap.c @@ -1,3 +1,6 @@ +#include <windows.h> +#include <fcntl.h> +#include <io.h> #include <stdio.h> #include <errno.h> @@ -6,15 +9,21 @@ int main() { int i; + _setmode(fileno(stdout), O_BINARY); printf("/* Generated file. Do not edit. */\n"); printf("int winerror_to_errno(int winerror)\n"); - printf("{\n\tswitch(winerror) {\n"); + printf("{\n switch(winerror) {\n"); for(i=1; i < 65000; i++) { _dosmaperr(i); - if (errno == EINVAL) - continue; - printf("\t\tcase %d: return %d;\n", i, errno); + if (errno == EINVAL) { + /* Issue #12802 */ + if (i == ERROR_DIRECTORY) + errno = ENOTDIR; + else + continue; + } + printf(" case %d: return %d;\n", i, errno); } - printf("\t\tdefault: return EINVAL;\n"); - printf("\t}\n}\n"); + printf(" default: return EINVAL;\n"); + printf(" }\n}\n"); } |