Fix saving to a file-like object.

mdboom · mdboom · commit b751318907e1 · 2007-12-06T18:47:50.000Z
svn path=/trunk/matplotlib/; revision=4651
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -214,7 +214,7 @@ def is_string_like(obj):
     return 1
 
 def is_writable_file_like(obj):
-    return hasattr(filename, 'write') and callable(filename.write)
+    return hasattr(obj, 'write') and callable(obj.write)
 
 def is_scalar(obj):
     return is_string_like(obj) or not iterable(obj)
@@ -891,7 +891,7 @@ def xy(self, i0=0, isub=1):
         return x, self._mem[i0:self._n:isub]
 
     def plot(self, i0=0, isub=1, fig=None):
-        if fig is None:            
+        if fig is None:
             from pylab import figure, show
             fig = figure()
 
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -2293,11 +2293,9 @@ RendererAgg::write_png(const Py::Tuple& args)
       throw Py::RuntimeError( Printf("Could not open file %s", file_name).str() );
   }
   else {
-    if ((fp = PyFile_AsFile(py_fileobj.ptr())) == NULL) {
-      PyObject* write_method = PyObject_GetAttrString(py_fileobj.ptr(), "write");
-      if (!(write_method && PyCallable_Check(write_method)))
-	throw Py::TypeError("Object does not appear to be a path or a Python file-like object");
-    }
+    PyObject* write_method = PyObject_GetAttrString(py_fileobj.ptr(), "write");
+    if (!(write_method && PyCallable_Check(write_method)))
+      throw Py::TypeError("Object does not appear to be a path or a Python file-like object");
   }
 
   png_bytep *row_pointers = NULL;

Original file line number	Diff line number	Diff line change
`@@ -2293,11 +2293,9 @@ RendererAgg::write_png(const Py::Tuple& args)`
`2293`	`2293`	`throw Py::RuntimeError( Printf("Could not open file %s", file_name).str() );`
`2294`	`2294`	`}`
`2295`	`2295`	`else {`
`2296`		`- if ((fp = PyFile_AsFile(py_fileobj.ptr())) == NULL) {`
`2297`		`- PyObject* write_method = PyObject_GetAttrString(py_fileobj.ptr(), "write");`
`2298`		`- if (!(write_method && PyCallable_Check(write_method)))`
`2299`		`- throw Py::TypeError("Object does not appear to be a path or a Python file-like object");`
`2300`		`- }`
	`2296`	`+ PyObject* write_method = PyObject_GetAttrString(py_fileobj.ptr(), "write");`
	`2297`	`+ if (!(write_method && PyCallable_Check(write_method)))`
	`2298`	`+ throw Py::TypeError("Object does not appear to be a path or a Python file-like object");`
`2301`	`2299`	`}`
`2302`	`2300`
`2303`	`2301`	`png_bytep *row_pointers = NULL;`