BUG: raise IOError on not a file in python2

juliantaylor · juliantaylor · commit 0ec441d60b6d · 2016-02-06T23:56:07.000+01:00
The change in 5225e4c did not account for PyFile_AsFile does not raise an error on invalid input, add the handling to equalize our wr5225e4c2007 apper function. closes gh-7200
diff --git a/numpy/core/include/numpy/npy_3kcompat.h b/numpy/core/include/numpy/npy_3kcompat.h
@@ -320,7 +320,13 @@ static NPY_INLINE FILE *
 npy_PyFile_Dup2(PyObject *file,
                 const char *NPY_UNUSED(mode), npy_off_t *NPY_UNUSED(orig_pos))
 {
-    return PyFile_AsFile(file);
+    FILE * fp = PyFile_AsFile(file);
+    if (fp == NULL) {
+        PyErr_SetString(PyExc_IOError,
+                        "first argument must be an open file");
+        return NULL;
+    }
+    return fp;
 }
 
 static NPY_INLINE int
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
@@ -583,8 +583,6 @@ array_tofile(PyArrayObject *self, PyObject *args, PyObject *kwds)
 
     fd = npy_PyFile_Dup2(file, "wb", &orig_pos);
     if (fd == NULL) {
-        PyErr_SetString(PyExc_IOError,
-                "first argument must be a string or open file");
         goto fail;
     }
     if (PyArray_ToFile(self, fd, sep, format) < 0) {
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
@@ -3582,6 +3582,14 @@ def setUp(self):
     def tearDown(self):
         shutil.rmtree(self.tempdir)
 
+    def test_nofile(self):
+        # this should probably be supported as a file
+        # but for now test for proper errors
+        b = io.BytesIO()
+        assert_raises(IOError, np.fromfile, b, np.uint8, 80)
+        d = np.ones(7);
+        assert_raises(IOError, lambda x: x.tofile(b), d)
+
     def test_bool_fromstring(self):
         v = np.array([True, False, True, False], dtype=np.bool_)
         y = np.fromstring('1 0 -2.3 0.0', sep=' ', dtype=np.bool_)

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,13 @@ static NPY_INLINE FILE *`
`320`	`320`	`npy_PyFile_Dup2(PyObject *file,`
`321`	`321`	`const char NPY_UNUSED(mode), npy_off_t NPY_UNUSED(orig_pos))`
`322`	`322`	`{`
`323`		`- return PyFile_AsFile(file);`
	`323`	`+ FILE * fp = PyFile_AsFile(file);`
	`324`	`+ if (fp == NULL) {`
	`325`	`+ PyErr_SetString(PyExc_IOError,`
	`326`	`+ "first argument must be an open file");`
	`327`	`+ return NULL;`
	`328`	`+ }`
	`329`	`+ return fp;`
`324`	`330`	`}`
`325`	`331`
`326`	`332`	`static NPY_INLINE int`
Original file line number	Diff line number	Diff line change
`@@ -583,8 +583,6 @@ array_tofile(PyArrayObject self, PyObject args, PyObject *kwds)`
`583`	`583`
`584`	`584`	`fd = npy_PyFile_Dup2(file, "wb", &orig_pos);`
`585`	`585`	`if (fd == NULL) {`
`586`		`- PyErr_SetString(PyExc_IOError,`
`587`		`- "first argument must be a string or open file");`
`588`	`586`	`goto fail;`
`589`	`587`	`}`
`590`	`588`	`if (PyArray_ToFile(self, fd, sep, format) < 0) {`