Change to using a helper function and isinstance(path, bytes)

sohero · sohero · commit 7c12fa0f938c · 2015-04-17T10:48:59.000+08:00
Change to using a helper function and isinstance(path, bytes) to decode __file__ based on file system encoding.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -652,6 +652,11 @@ 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'
@@ -662,33 +667,23 @@ def _get_data_path():
             raise RuntimeError('Path in environment MATPLOTLIBDATA not a '
                                'directory')
         return path
-
-    if hasattr(__file__, 'decode'):
-        _file = __file__.decode(sys.getfilesystemencoding())
-    else:
-        _file = __file__
+    
+    _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
-    if hasattr(matplotlib.afm.__file__, 'decode'):
-        _file = matplotlib.afm.__file__.decode(sys.getfilesystemencoding())
-    else:
-        _file = matplotlib.afm.__file__
+    _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):
-        if hasattr(sys.executable, 'decode'):
-            _file = sys.executable.decode(sys.getfilesystemencoding())
-        else:
-            _file = sys.executable
-        exe_path = os.path.dirname(_file)
+        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
