Merge pull request #3487 from mdboom/use-getcwdu

tacaswell · tacaswell · commit 1b11e2f8e851 · 2014-09-17T19:47:46.000-04:00
BUG : use getcwdu to deal with unicode in user home-path in python 2
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -745,7 +745,11 @@ def matplotlib_fname():
     - Lastly, it looks in `$MATPLOTLIBDATA/matplotlibrc` for a
       system-defined copy.
     """
-    fname = os.path.join(os.getcwd(), 'matplotlibrc')
+    if six.PY2:
+        cwd = os.getcwdu()
+    else:
+        cwd = os.getcwd()
+    fname = os.path.join(cwd, 'matplotlibrc')
     if os.path.exists(fname):
         return fname
 
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -447,8 +447,10 @@ def run_code(code, code_path, ns=None, function_name=None):
     # Change the working directory to the directory of the example, so
     # it can get at its data files, if any.  Add its path to sys.path
     # so it can import any helper modules sitting beside it.
-
-    pwd = os.getcwd()
+    if six.PY2:
+        pwd = os.getcwdu()
+    else:
+        pwd = os.getcwd()
     old_sys_path = list(sys.path)
     if setup.config.plot_working_directory is not None:
         try:
