Merge pull request #5931 from ntessore/patch-1

tacaswell · tacaswell · commit 2ac494f71676 · 2016-02-15T15:47:48.000-05:00
use `locale.getpreferredencoding()` to prevent OS X locale issues
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1003,7 +1003,7 @@ def _open_file_or_url(fname):
         f.close()
     else:
         fname = os.path.expanduser(fname)
-        encoding = locale.getdefaultlocale()[1]
+        encoding = locale.getpreferredencoding(do_setlocale=False)
         if encoding is None:
             encoding = "utf-8"
         with io.open(fname, encoding=encoding) as f:
@@ -1044,7 +1044,8 @@ def _rc_params_in_file(fname, fail_on_error=False):
             warnings.warn(
                 ('Cannot decode configuration file %s with '
                  'encoding %s, check LANG and LC_* variables')
-                % (fname, locale.getdefaultlocale()[1] or 'utf-8 (default)'))
+                % (fname, locale.getpreferredencoding(do_setlocale=False) or
+                   'utf-8 (default)'))
             raise
 
     config = RcParams()
