Use unicode instead of str

mspacek · mspacek · commit 9a305a41d7be · 2013-02-01T14:45:35.000-08:00
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -747,7 +747,7 @@ def save_figure(self, *args):
                 rcParams['savefig.directory'] = startpath
             else:
                 # save dir for next time
-                rcParams['savefig.directory'] = os.path.dirname(str(fname))
+                rcParams['savefig.directory'] = os.path.dirname(unicode(fname))
             try:
                 self.canvas.print_figure(fname, format=format)
             except Exception as e:
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -552,7 +552,7 @@ def save_figure(self, *args):
                 rcParams['savefig.directory'] = startpath
             else:
                 # save dir for next time
-                rcParams['savefig.directory'] = os.path.dirname(str(fname))
+                rcParams['savefig.directory'] = os.path.dirname(unicode(fname))
             try:
                 self.canvas.print_figure(fname, format=format)
             except Exception, e:
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -664,7 +664,7 @@ def save_figure(self, *args):
                 matplotlib.rcParams['savefig.directory'] = startpath
             else:
                 # save dir for next time
-                matplotlib.rcParams['savefig.directory'] = os.path.dirname(str(fname))
+                matplotlib.rcParams['savefig.directory'] = os.path.dirname(unicode(fname))
             try:
                 self.canvas.print_figure( unicode(fname) )
             except Exception as e:
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -915,7 +915,7 @@ def save_figure(self, *args):
                 rcParams['savefig.directory'] = initialdir
             else:
                 # save dir for next time
-                rcParams['savefig.directory'] = os.path.dirname(str(fname))
+                rcParams['savefig.directory'] = os.path.dirname(unicode(fname))
             try:
                 # This method will handle the delegation to the correct type
                 self.canvas.print_figure(fname)
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -687,7 +687,7 @@ def __call__(self, s):
     'savefig.bbox':       [None, validate_bbox],
     'savefig.pad_inches': [0.1, validate_float],
     # default directory in savefig dialog box
-    'savefig.directory': ['~', str],
+    'savefig.directory': ['~', unicode],
 
     # Maintain shell focus for TkAgg
     'tk.window_focus':  [False, validate_bool],
