Merge pull request #5465 from WeatherGod/fix_5464

tacaswell · tacaswell · commit 91ca2a3724ae · 2015-11-18T00:13:47.000-05:00
FIX: Better test for isarray in figaspect(). Closes #5464.
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1758,7 +1758,7 @@ def figaspect(arg):
     Thanks to Fernando Perez for this function
     """
 
-    isarray = hasattr(arg, 'shape')
+    isarray = hasattr(arg, 'shape') and not np.isscalar(arg)
 
     # min/max sizes to respect when autoscaling.  If John likes the idea, they
     # could become rc parameters, for now they're hardwired.
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -8,6 +8,7 @@
 from matplotlib.testing.decorators import image_comparison, cleanup
 from matplotlib.axes import Axes
 import matplotlib.pyplot as plt
+import numpy as np
 
 
 @cleanup
@@ -191,6 +192,17 @@ def test_axes_remove():
     assert_equal(len(fig.axes), 3)
 
 
+def test_figaspect():
+    w, h = plt.figaspect(np.float64(2) / np.float64(1))
+    assert h / w == 2
+    w, h = plt.figaspect(2)
+    assert h / w == 2
+    w, h = plt.figaspect(np.zeros((1, 2)))
+    assert h / w == 0.5
+    w, h = plt.figaspect(np.zeros((2, 2)))
+    assert h / w == 1
+
+
 if __name__ == "__main__":
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
