Merge pull request #3594 from wernerfb/UnicodeInitProblem

BUG : Unicode decode error on with unicode username on py2+win
matplotlib · Sep 30, 2014 · 95a9ef8 · 95a9ef8
2 parents c439104 + dd7f7c0
commit 95a9ef8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -523,7 +523,10 @@ def _get_home():
         http://mail.python.org/pipermail/python-list/2005-February/325395.html
     """
     try:
-        path = os.path.expanduser("~")
+        if six.PY2 and sys.platform == 'win32':
+            path = os.path.expanduser(b"~").decode(sys.getfilesystemencoding())
+        else:
+            path = os.path.expanduser("~")
     except ImportError:
         # This happens on Google App Engine (pwd module is not present).
         pass