Merge pull request matplotlib#4343 from sohero/patch-1

FIX : decode the execution path string based file system encoding

Prevents issues on systems with mixed encodings.

Author: tacaswell

lib/matplotlib/__init__.py

@@ -653,6 +653,13 @@ def _get_cachedir():
 get_cachedir = verbose.wrap('CACHEDIR=%s', _get_cachedir, always=False)
 
 
+def _decode_filesystem_path(path):
+    if isinstance(path, bytes):
+        return path.decode(sys.getfilesystemencoding())
+    else:
+        return path
+
+
 def _get_data_path():
     'get the path to matplotlib data'
 
@@ -663,20 +670,22 @@ def _get_data_path():
                                'directory')
         return path
 
-    path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
+    _file = _decode_filesystem_path(__file__)
+    path = os.sep.join([os.path.dirname(_file), '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'])
+    _file = _decode_filesystem_path(matplotlib.afm.__file__)
+    path = os.sep.join([os.path.dirname(_file), '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(_decode_filesystem_path(sys.executable))
         path = os.path.join(exe_path, 'mpl-data')
         if os.path.isdir(path):
             return path