Merge pull request #2898 from bytbox/v1.3.x

efiring · efiring · commit 2b74cb5d9918 · 2014-05-13T08:20:26.000-10:00
Fix animation errors
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -2168,6 +2168,7 @@ RendererAgg::write_rgba(const Py::Tuple& args)
     }
     else
     {
+        PyErr_Clear();
         PyObject* write_method = PyObject_GetAttrString(py_fileobj.ptr(),
                                                         "write");
         if (!(write_method && PyCallable_Check(write_method)))
@@ -2177,7 +2178,11 @@ RendererAgg::write_rgba(const Py::Tuple& args)
                 "Object does not appear to be a 8-bit string path or a Python file-like object");
         }
 
+        #if PY3K
+        PyObject_CallFunction(write_method, (char *)"y#", pixBuffer, NUMBYTES);
+        #else
         PyObject_CallFunction(write_method, (char *)"s#", pixBuffer, NUMBYTES);
+        #endif
 
         Py_XDECREF(write_method);
     }
diff --git a/src/file_compat.h b/src/file_compat.h
@@ -101,8 +101,8 @@ mpl_PyFile_Dup(PyObject *file, char *mode, mpl_off_t *orig_pos)
     /* Record the original raw file handle position */
     *orig_pos = npy_ftell(handle);
     if (*orig_pos == -1) {
-        PyErr_SetString(PyExc_IOError, "obtaining file position failed");
-        return NULL;
+        // handle is a stream, so we don't have to worry about this
+        return handle;
     }
 
     /* Seek raw handle to the Python-side position */
@@ -145,22 +145,19 @@ mpl_PyFile_DupClose(PyObject *file, FILE* handle, mpl_off_t orig_pos)
     if (fd == -1) {
         return -1;
     }
-    if (npy_lseek(fd, orig_pos, SEEK_SET) == -1) {
-        PyErr_SetString(PyExc_IOError, "seeking file failed");
-        return -1;
-    }
-
-    if (position == -1) {
-        PyErr_SetString(PyExc_IOError, "obtaining file position failed");
-        return -1;
-    }
+    if (npy_lseek(fd, orig_pos, SEEK_SET) != -1) {
+        if (position == -1) {
+            PyErr_SetString(PyExc_IOError, "obtaining file position failed");
+            return -1;
+        }
 
-    /* Seek Python-side handle to the FILE* handle position */
-    ret = PyObject_CallMethod(file, "seek", MPL_OFF_T_PYFMT "i", position, 0);
-    if (ret == NULL) {
-        return -1;
+        /* Seek Python-side handle to the FILE* handle position */
+        ret = PyObject_CallMethod(file, "seek", MPL_OFF_T_PYFMT "i", position, 0);
+        if (ret == NULL) {
+            return -1;
+        }
+        Py_DECREF(ret);
     }
-    Py_DECREF(ret);
     return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2168,6 +2168,7 @@ RendererAgg::write_rgba(const Py::Tuple& args)`
`2168`	`2168`	`}`
`2169`	`2169`	`else`
`2170`	`2170`	`{`
	`2171`	`+ PyErr_Clear();`
`2171`	`2172`	`PyObject* write_method = PyObject_GetAttrString(py_fileobj.ptr(),`
`2172`	`2173`	`"write");`
`2173`	`2174`	`if (!(write_method && PyCallable_Check(write_method)))`
`@@ -2177,7 +2178,11 @@ RendererAgg::write_rgba(const Py::Tuple& args)`
`2177`	`2178`	`"Object does not appear to be a 8-bit string path or a Python file-like object");`
`2178`	`2179`	`}`
`2179`	`2180`
	`2181`	`+ #if PY3K`
	`2182`	`+ PyObject_CallFunction(write_method, (char *)"y#", pixBuffer, NUMBYTES);`
	`2183`	`+ #else`
`2180`	`2184`	`PyObject_CallFunction(write_method, (char *)"s#", pixBuffer, NUMBYTES);`
	`2185`	`+ #endif`
`2181`	`2186`
`2182`	`2187`	`Py_XDECREF(write_method);`
`2183`	`2188`	`}`