Merge pull request #5019 from jheinen/master

Default to UTF-8 if locale.getdefaultlocale() returns None for the encoding
matplotlib · Sep 5, 2015 · 27606b7 · 27606b7
2 parents 0bbf040 + 258f445
commit 27606b7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -992,6 +992,8 @@ def _open_file_or_url(fname):
     else:
         fname = os.path.expanduser(fname)
         encoding = locale.getdefaultlocale()[1]
+        if encoding is None:
+            encoding = "utf-8"
         with io.open(fname, encoding=encoding) as f:
             yield f