Merge pull request #11638 from meeseeksmachine/auto-backport-of-pr-11636-on-v2.2.x

QuLogic · web-flow · commit 711bb3ff0b8b · 2018-07-11T18:38:08.000-04:00
Backport PR #11636 on branch v2.2.x
diff --git a/src/file_compat.h b/src/file_compat.h
@@ -60,12 +60,15 @@ static NPY_INLINE FILE *mpl_PyFile_Dup(PyObject *file, char *mode, mpl_off_t *or
     mpl_off_t pos;
     FILE *handle;
 
-    /* Flush first to ensure things end up in the file in the correct order */
-    ret = PyObject_CallMethod(file, (char *)"flush", (char *)"");
-    if (ret == NULL) {
-        return NULL;
+    if (mode[0] != 'r') {
+        /* Flush first to ensure things end up in the file in the correct order */
+        ret = PyObject_CallMethod(file, (char *)"flush", (char *)"");
+        if (ret == NULL) {
+            return NULL;
+        }
+        Py_DECREF(ret);
     }
-    Py_DECREF(ret);
+
     fd = PyObject_AsFileDescriptor(file);
     if (fd == -1) {
         return NULL;
