From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Fri, 9 Nov 2001 16:17:24 +0000 (+0000)
Subject: Fix SF buf #476953: Bad more for opening file gives bad msg.
X-Git-Tag: v2.2.1c1~820
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41c8321252a84d8a9d0ded374e7db7a4393036be;p=thirdparty%2FPython%2Fcpython.git

Fix SF buf #476953: Bad more for opening file gives bad msg.

If fopen() fails with EINVAL it means that the mode argument is
invalid.  Return the mode in the error message instead of the
filename.
---

diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index a85e07cacf7a..cb1bdce08e0d 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -46,4 +46,15 @@ else:
     print "writelines accepted sequence of non-string objects"
 f.close()
 
+# verify that we get a sensible error message for bad made argument
+bad_mode = "qwerty"
+try:
+    open(TESTFN, bad_mode)
+except IOError, msg:
+    s = str(msg)
+    if s.find(TESTFN) != -1 or s.find(bad_mode) == -1:
+        print "bad error message for invalid mode: %s" % s
+else:
+    print "no error for invalid mode: %s" % bad_mode
+
 os.unlink(TESTFN)
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index ebccc845cc25..9284185be637 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -121,13 +121,17 @@ open_the_file(PyFileObject *f, char *name, char *mode)
 	if (f->f_fp == NULL) {
 #ifdef NO_FOPEN_ERRNO
 		/* Metroworks only, not testable, so unchanged */
-		if ( errno == 0 ) {
+		if (errno == 0) {
 			PyErr_SetString(PyExc_IOError, "Cannot open file");
 			Py_DECREF(f);
 			return NULL;
 		}
 #endif
-		PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
+		if (errno == EINVAL)
+			PyErr_Format(PyExc_IOError, "invalid argument: %s",
+				     mode);
+		else
+			PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
 		f = NULL;
 	}
 	return (PyObject *)f;