Ticket #50717: py-matplotlib-fixlocale.diff

Portfile

@@ -55 +55 @@
 
     patchfiles-append   patch-setup.cfg.diff \
                         patch-setupext.py.diff \
-                        patch-src-macosx.m.diff
+                        patch-src-macosx.m.diff \
+                        patch-matplotlib-__init__.py.diff
 
     build.env           PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig"
 

files/patch-matplotlib-__init__.py.diff

@@ +1 @@
+From 2ac494f71676e8cf824ae7eced1bca0848bb5a59 Mon Sep 17 00:00:00 2001
+From: Thomas A Caswell <tcaswell@gmail.com>
+Date: Mon, 15 Feb 2016 15:35:59 -0500
+Subject: [PATCH] Merge pull request #5931 from ntessore/patch-1
+
+use `locale.getpreferredencoding()` to prevent OS X locale issues
+---
+ lib/matplotlib/__init__.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
+index f7f4d53..53216ab 100644
+--- lib/matplotlib/__init__.py
++++ lib/matplotlib/__init__.py
+@@ -997,7 +997,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:
+@@ -1038,7 +1038,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()