matplotlib
diff --git a/‎lib/matplotlib/__init__.py
Copy file name to clipboardExpand all lines: lib/matplotlib/__init__.py
+16-10Lines changed: 16 additions & 10 deletions b/‎lib/matplotlib/__init__.py
Copy file name to clipboardExpand all lines: lib/matplotlib/__init__.py
+16-10Lines changed: 16 additions & 10 deletions
diff --git a/‎lib/matplotlib/finance.py
Copy file name to clipboardExpand all lines: lib/matplotlib/finance.py
+2Lines changed: 2 additions & 0 deletions b/‎lib/matplotlib/finance.py
Copy file name to clipboardExpand all lines: lib/matplotlib/finance.py
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎lib/matplotlib/font_manager.py
Copy file name to clipboardExpand all lines: lib/matplotlib/font_manager.py
+5-2Lines changed: 5 additions & 2 deletions b/‎lib/matplotlib/font_manager.py
Copy file name to clipboardExpand all lines: lib/matplotlib/font_manager.py
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/‎lib/matplotlib/testing/compare.py
Copy file name to clipboardExpand all lines: lib/matplotlib/testing/compare.py
+4-1Lines changed: 4 additions & 1 deletion b/‎lib/matplotlib/testing/compare.py
Copy file name to clipboardExpand all lines: lib/matplotlib/testing/compare.py
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎lib/matplotlib/texmanager.py
Copy file name to clipboardExpand all lines: lib/matplotlib/texmanager.py
+2Lines changed: 2 additions & 0 deletions b/‎lib/matplotlib/texmanager.py
Copy file name to clipboardExpand all lines: lib/matplotlib/texmanager.py
+2Lines changed: 2 additions & 0 deletions
@@ -656,20 +656,25 @@ def matplotlib_fname():
             print("WARNING: File could not be renamed: %s" % e, file=sys.stderr)
 
     home = get_home()
+    configdir = get_configdir()
     if home:
         oldname = os.path.join( home, '.matplotlibrc')
         if os.path.exists(oldname):
-            configdir = get_configdir()
-            newname = os.path.join(configdir, 'matplotlibrc')
-            print("""\
+            if configdir is not None:
+                newname = os.path.join(configdir, 'matplotlibrc')
+                print("""\
 WARNING: Old rc filename "%s" found and renamed to
   new default rc file name "%s"."""%(oldname, newname), file=sys.stderr)
 
-            try:
-                shutil.move(oldname, newname)
-            except IOError as e:
-                print("WARNING: File could not be renamed: %s" % e,
-                      file=sys.stderr)
+                try:
+                    shutil.move(oldname, newname)
+                except IOError as e:
+                    print("WARNING: File could not be renamed: %s" % e,
+                          file=sys.stderr)
+            else:
+                print("""\
+WARNING: Could not rename old rc file "%s": a suitable configuration directory
+  could not be found.""" % oldname, file=sys.stderr)
 
 
     fname = os.path.join( os.getcwd(), 'matplotlibrc')
@@ -682,8 +687,9 @@ def matplotlib_fname():
             if os.path.exists(fname):
                 return fname
 
-    fname = os.path.join(get_configdir(), 'matplotlibrc')
-    if os.path.exists(fname): return fname
+    if configdir is not None:
+        fname = os.path.join(configdir, 'matplotlibrc')
+        if os.path.exists(fname): return fname
 
 
     path =  get_data_path() # guaranteed to exist or raise
 
@@ -28,6 +28,8 @@
 
 
 configdir = get_configdir()
+if configdir is None:
+    raise RuntimeError('Could not find a suitable configuration directory')
 cachedir = os.path.join(configdir, 'finance.cache')
 
 
 
@@ -1311,10 +1311,13 @@ def findfont(prop, fontext='ttf'):
         return result
 
 else:
+    configdir = get_configdir()
+    if configdir is None:
+        raise RuntimeError('Could not find a suitable configuration directory')
     if sys.version_info[0] >= 3:
-        _fmcache = os.path.join(get_configdir(), 'fontList.py3k.cache')
+        _fmcache = os.path.join(configdir, 'fontList.py3k.cache')
     else:
-        _fmcache = os.path.join(get_configdir(), 'fontList.cache')
+        _fmcache = os.path.join(configdir, 'fontList.cache')
 
     fontManager = None
 
 
@@ -99,7 +99,10 @@ def compare_float( expected, actual, relTol = None, absTol = None ):
 # parameters old and new to a list that can be passed to Popen to
 # convert files with that extension to png format.
 def get_cache_dir():
-   cache_dir = os.path.join(_get_configdir(), 'test_cache')
+   configdir = _get_configdir()
+   if configdir is None:
+      raise RuntimeError('Could not find a suitable configuration directory')
+   cache_dir = os.path.join(configdir, 'test_cache')
    if not os.path.exists(cache_dir):
       try:
          os.makedirs(cache_dir)
 
@@ -94,6 +94,8 @@ class TexManager:
     oldcache = os.path.join(oldpath, '.tex.cache')
 
     configdir = mpl.get_configdir()
+    if configdir is None:
+        raise RuntimeError('Could not find a suitable configuration directory')
     texcache = os.path.join(configdir, 'tex.cache')
 
     if os.path.exists(oldcache):