Merge branch 'v1.0.x'

WeatherGod · WeatherGod · commit f00ee56e7084 · 2011-03-08T09:45:43.000-06:00
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -22,6 +22,22 @@
 except ImportError:
     raise ImportError("Qt4 backend requires that PyQt4 is installed.")
 
+import sip
+
+try :
+    if sip.getapi("QString") > 1 :
+        # Use new getSaveFileNameAndFilter()
+        _getSaveFileName = lambda self, msg, start, filters, selectedFilter : \
+                            QtGui.QFileDialog.getSaveFileNameAndFilter(self,  \
+                                msg, start, filters, selectedFilter)[0]
+    else :
+        # Use old getSaveFileName()
+        _getSaveFileName = QtGui.QFileDialog.getSaveFileName
+except (AttributeError, KeyError) :
+    # call to getapi() can fail in older versions of sip
+    # Use the old getSaveFileName()
+    _getSaveFileName = QtGui.QFileDialog.getSaveFileName
+
 backend_version = "0.9.1"
 def fn_name(): return sys._getframe(1).f_code.co_name
 
@@ -529,8 +545,8 @@ def save_figure(self, *args):
             filters.append(filter)
         filters = ';;'.join(filters)
 
-        fname = QtGui.QFileDialog.getSaveFileName(
-            self, "Choose a filename to save to", start, filters, selectedFilter)
+        fname = _getSaveFileName(self, "Choose a filename to save to",
+                                        start, filters, selectedFilter)
         if fname:
             try:
                 self.canvas.print_figure( unicode(fname) )
