FIX: always normalize dpi

tacaswell · tacaswell · commit 259483a52db5 · 2016-03-05T20:24:58.000-05:00
The string 'figure' is a valid value for dpi. Always check if this is the input, not just if we look it up from the rcparams. closes #6113
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -755,8 +755,8 @@ def save(self, filename, writer=None, fps=None, dpi=None, codec=None,
         # Re-use the savefig DPI for ours if none is given
         if dpi is None:
             dpi = rcParams['savefig.dpi']
-            if dpi == 'figure':
-                dpi = self._fig.dpi
+        if dpi == 'figure':
+            dpi = self._fig.dpi
 
         if codec is None:
             codec = rcParams['animation.codec']
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2141,8 +2141,8 @@ def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
 
         if dpi is None:
             dpi = rcParams['savefig.dpi']
-            if dpi == 'figure':
-                dpi = self.figure.dpi
+        if dpi == 'figure':
+            dpi = self.figure.dpi
 
         origDPI = self.figure.dpi
         origfacecolor = self.figure.get_facecolor()
