Merge pull request #6114 from tacaswell/fix_print_figure_dpi

jenshnielsen · jenshnielsen · commit 637c3da3b0cb · 2016-03-06T17:48:34.000Z
Fix print figure dpi
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()
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1538,8 +1538,6 @@ def savefig(self, *args, **kwargs):
         """
 
         kwargs.setdefault('dpi', rcParams['savefig.dpi'])
-        if kwargs['dpi'] == 'figure':
-            kwargs['dpi'] = self.get_dpi()
         frameon = kwargs.pop('frameon', rcParams['savefig.frameon'])
         transparent = kwargs.pop('transparent',
                                  rcParams['savefig.transparent'])
