decode the execution path string based file system encoding

sohero · sohero · commit 4cb27c0966be · 2015-04-16T10:09:58.000+08:00
When my py file importing matplotlib run in a folder where the path contains gbk encoding character, matplotlib will raise a unicode decode error.The changes in line 666/673/679 will fix the problem.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -663,20 +663,20 @@ def _get_data_path():
                                'directory')
         return path
 
-    path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
+    path = os.sep.join([os.path.dirname(__file__.decode(sys.getfilesystemencoding())), 'mpl-data'])
     if os.path.isdir(path):
         return path
 
     # setuptools' namespace_packages may highjack this init file
     # so need to try something known to be in matplotlib, not basemap
     import matplotlib.afm
-    path = os.sep.join([os.path.dirname(matplotlib.afm.__file__), 'mpl-data'])
+    path = os.sep.join([os.path.dirname(matplotlib.afm.__file__.decode(sys.getfilesystemencoding())), 'mpl-data'])
     if os.path.isdir(path):
         return path
 
     # py2exe zips pure python, so still need special check
     if getattr(sys, 'frozen', None):
-        exe_path = os.path.dirname(sys.executable)
+        exe_path = os.path.dirname(sys.executable.decode(sys.getfilesystemencoding()))
         path = os.path.join(exe_path, 'mpl-data')
         if os.path.isdir(path):
             return path
