allow $MATPLOTLIBRC to specify the file directly

itoijala · itoijala · commit c4da0f48b635 · 2015-10-18T15:32:36.000+02:00
diff --git a/doc/users/customizing.rst b/doc/users/customizing.rst
@@ -56,7 +56,7 @@ locations, in the following order:
 1. :file:`matplotlibrc` in the current working directory, usually used for
    specific customizations that you do not want to apply elsewhere.
 
-2. :file:`$MATPLOTLIBRC/matplotlibrc`.
+2. :file:`$MATPLOTLIBRC` if it is a file, else :file:`$MATPLOTLIBRC/matplotlibrc`.
 
 3. It next looks in a user-specific place, depending on your platform:
 
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -755,6 +755,8 @@ def matplotlib_fname():
 
     - `$PWD/matplotlibrc`
 
+    - `$MATPLOTLIBRC` if it is a file
+
     - `$MATPLOTLIBRC/matplotlibrc`
 
     - `$MPLCONFIGDIR/matplotlibrc`
@@ -787,6 +789,8 @@ def matplotlib_fname():
     if 'MATPLOTLIBRC' in os.environ:
         path = os.environ['MATPLOTLIBRC']
         if os.path.exists(path):
+            if os.path.isfile(path):
+                return path
             fname = os.path.join(path, 'matplotlibrc')
             if os.path.exists(fname):
                 return fname
