Merged revisions 5024-5025 via svnmerge from

mdboom · mdboom · commit d3283cc9fa77 · 2008-03-27T14:42:26.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint ........ r5025 | mdboom | 2008-03-27 10:26:19 -0400 (Thu, 27 Mar 2008) | 4 lines Fix saving to Unicode filenames in Agg backend. Fix Qt and Qt4 GUI's to support saving to Unicode filenames in file save dialogs. Wx, Gtk and Tk GUIs already appear to work. ........ svn path=/trunk/matplotlib/; revision=5026
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+2008-03-27 Fix saving to Unicode filenames with Agg backend
+           (other backends appear to already work...)
+           (Thanks, Christopher Barker) - MGD
+
 2008-03-26 Fix SVG backend bug that prevents copying and pasting in
            Inkscape (thanks Kaushik Ghose) - MGD
 
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -286,19 +286,23 @@ def buffer_rgba(self,x,y):
     def get_default_filetype(self):
         return 'png'
 
-    def print_raw(self, filename, *args, **kwargs):
+    def print_raw(self, filename_or_obj, *args, **kwargs):
         FigureCanvasAgg.draw(self)
+        renderer = self.get_renderer()
         original_dpi = renderer.dpi
         renderer.dpi = self.figure.dpi
-        renderer._renderer.write_rgba(str(filename))
+        if type(filename_or_obj) in (str, unicode):
+            filename_or_obj = open(filename_or_obj, 'w')
+        renderer._renderer.write_rgba(filename_or_obj)
         renderer.dpi = original_dpi
     print_rgba = print_raw
 
-    def print_png(self, filename, *args, **kwargs):
+    def print_png(self, filename_or_obj, *args, **kwargs):
         FigureCanvasAgg.draw(self)
         renderer = self.get_renderer()
         original_dpi = renderer.dpi
         renderer.dpi = self.figure.dpi
-        filename = str(filename) # until we figure out unicode handling
-        renderer._renderer.write_png(filename, self.figure.dpi)
+        if type(filename_or_obj) in (str, unicode):
+            filename_or_obj = open(filename_or_obj, 'w')
+        self.get_renderer()._renderer.write_png(filename_or_obj, self.figure.dpi)
         renderer.dpi = original_dpi
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -427,7 +427,7 @@ def save_figure( self ):
             selectedFilter)
         if fname:
             try:
-                self.canvas.print_figure( fname.latin1() )
+                self.canvas.print_figure( unicode(fname) )
             except Exception, e:
                 qt.QMessageBox.critical(
                     self, "Error saving file", str(e),
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -376,7 +376,7 @@ def save_figure( self ):
             self, "Choose a filename to save to", start, filters, selectedFilter)
         if fname:
             try:
-                self.canvas.print_figure( str(fname.toLatin1()) )
+                self.canvas.print_figure( unicode(fname) )
             except Exception, e:
                 QtGui.QMessageBox.critical(
                     self, "Error saving file", str(e),
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -1286,12 +1286,33 @@ RendererAgg::write_rgba(const Py::Tuple& args) {
   _VERBOSE("RendererAgg::write_rgba");
 
   args.verify_length(1);
-  std::string fname = Py::String(args[0]);
 
-  std::ofstream of2( fname.c_str(), std::ios::binary|std::ios::out);
-  for (size_t i=0; i<NUMBYTES; i++) {
-    of2.write((char*)&(pixBuffer[i]), sizeof(char));
+  FILE *fp = NULL;
+  bool close_file = false;
+  Py::Object py_fileobj = Py::Object(args[0]);
+  if (py_fileobj.isString()) {
+    std::string fileName = Py::String(py_fileobj);
+    const char *file_name = fileName.c_str();
+    if ((fp = fopen(file_name, "wb")) == NULL)
+      throw Py::RuntimeError( Printf("Could not open file %s", file_name).str() );
+    fwrite(pixBuffer, 1, NUMBYTES, fp);
+    close_file = true;
+    fclose(fp);
+  } else if (PyFile_CheckExact(py_fileobj.ptr())) {
+    fp = PyFile_AsFile(py_fileobj.ptr());
+    fwrite(pixBuffer, 1, NUMBYTES, fp);
+  } else {
+    PyObject* write_method = PyObject_GetAttrString(py_fileobj.ptr(), "write");
+    if (!(write_method && PyCallable_Check(write_method))) {
+      Py_XDECREF(write_method);
+      throw Py::TypeError("Object does not appear to be a 8-bit string path or a Python file-like object");
+    }
+
+    PyObject_CallFunction(write_method, "s#", pixBuffer, NUMBYTES);
+
+    Py_XDECREF(write_method);
   }
+
   return Py::Object();
 }
 
@@ -1326,18 +1347,22 @@ RendererAgg::write_png(const Py::Tuple& args)
   args.verify_length(1, 2);
 
   FILE *fp = NULL;
+  bool close_file = false;
   Py::Object py_fileobj = Py::Object(args[0]);
   if (py_fileobj.isString()) {
     std::string fileName = Py::String(py_fileobj);
     const char *file_name = fileName.c_str();
     if ((fp = fopen(file_name, "wb")) == NULL)
       throw Py::RuntimeError( Printf("Could not open file %s", file_name).str() );
+    close_file = true;
+  } else if (PyFile_CheckExact(py_fileobj.ptr())) {
+    fp = PyFile_AsFile(py_fileobj.ptr());
   }
   else {
     PyObject* write_method = PyObject_GetAttrString(py_fileobj.ptr(), "write");
     if (!(write_method && PyCallable_Check(write_method))) {
       Py_XDECREF(write_method);
-      throw Py::TypeError("Object does not appear to be a path or a Python file-like object");
+      throw Py::TypeError("Object does not appear to be a 8-bit string path or a Python file-like object");
     }
     Py_XDECREF(write_method);
   }
@@ -1406,15 +1431,15 @@ RendererAgg::write_png(const Py::Tuple& args)
     */
 
   } catch (...) {
-      if (fp) fclose(fp);
+      if (fp && close_file) fclose(fp);
       delete [] row_pointers;
       if (png_ptr && info_ptr) png_destroy_write_struct(&png_ptr, &info_ptr);
       throw;
   }
 
   png_destroy_write_struct(&png_ptr, &info_ptr);
   delete [] row_pointers;
-  if (fp) fclose(fp);
+  if (fp && close_file) fclose(fp);
 
   return Py::Object();
 }
