Merge remote-tracking branch 'upstream/v1.5.x' into v2.0.x

mdboom · mdboom · commit deeec9cfbd0a · 2015-11-18T14:13:38.000-05:00
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/testing/__init__.py b/lib/matplotlib/testing/__init__.py
@@ -5,6 +5,7 @@
 from contextlib import contextmanager
 
 from matplotlib.cbook import is_string_like, iterable
+from matplotlib import rcParams, rcdefaults, use
 
 
 def _is_list_like(obj):
@@ -70,3 +71,36 @@ def assert_produces_warning(expected_warning=Warning, filter_level="always",
                                  % expected_warning.__name__)
         assert not extra_warnings, ("Caused unexpected warning(s): %r."
                                     % extra_warnings)
+
+
+def set_font_settings_for_testing():
+    rcParams['font.family'] = 'DejaVu Sans'
+    rcParams['text.hinting'] = False
+    rcParams['text.hinting_factor'] = 8
+
+
+def setup():
+    # The baseline images are created in this locale, so we should use
+    # it during all of the tests.
+    import locale
+    import warnings
+    from matplotlib.backends import backend_agg, backend_pdf, backend_svg
+
+    try:
+        locale.setlocale(locale.LC_ALL, str('en_US.UTF-8'))
+    except locale.Error:
+        try:
+            locale.setlocale(locale.LC_ALL, str('English_United States.1252'))
+        except locale.Error:
+            warnings.warn(
+                "Could not set locale to English/United States. "
+                "Some date-related tests may fail")
+
+    use('Agg', warn=False)  # use Agg backend for these tests
+
+    # These settings *must* be hardcoded for running the comparison
+    # tests and are not necessarily the default values as specified in
+    # rcsetup.py
+    rcdefaults()  # Start with all defaults
+
+    set_font_settings_for_testing()
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -16,8 +16,8 @@
 
 import matplotlib as mpl
 import matplotlib.style
-import matplotlib.tests
 import matplotlib.units
+import matplotlib.testing
 from matplotlib import cbook
 from matplotlib import ticker
 from matplotlib import pyplot as plt
@@ -85,7 +85,7 @@ class CleanupTest(object):
     def setup_class(cls):
         cls.original_units_registry = matplotlib.units.registry.copy()
         cls.original_settings = mpl.rcParams.copy()
-        matplotlib.tests.setup()
+        matplotlib.testing.setup()
 
     @classmethod
     def teardown_class(cls):
@@ -175,7 +175,7 @@ def setup_class(cls):
             mpl.rcParams.update(cls._initial_settings)
             raise
         cls.original_settings = cls._initial_settings
-        matplotlib.tests.set_font_settings_for_testing()
+        matplotlib.testing.set_font_settings_for_testing()
         cls._func()
 
     @classmethod
@@ -396,7 +396,7 @@ def switch_backend_decorator(func):
         def backend_switcher(*args, **kwargs):
             try:
                 prev_backend = mpl.get_backend()
-                matplotlib.tests.setup()
+                matplotlib.testing.setup()
                 plt.switch_backend(backend)
                 result = func(*args, **kwargs)
             finally:
diff --git a/lib/matplotlib/tests/__init__.py b/lib/matplotlib/tests/__init__.py
@@ -6,8 +6,7 @@
 import difflib
 import os
 
-from matplotlib import rcParams, rcdefaults, use
-
+from matplotlib.testing import setup
 
 _multiprocess_can_split_ = True
 
@@ -22,39 +21,6 @@
         'test data.')
 
 
-def set_font_settings_for_testing():
-    rcParams['font.family'] = 'DejaVu Sans'
-    rcParams['text.hinting'] = False
-    rcParams['text.hinting_factor'] = 8
-
-
-def setup():
-    # The baseline images are created in this locale, so we should use
-    # it during all of the tests.
-    import locale
-    import warnings
-    from matplotlib.backends import backend_agg, backend_pdf, backend_svg
-
-    try:
-        locale.setlocale(locale.LC_ALL, str('en_US.UTF-8'))
-    except locale.Error:
-        try:
-            locale.setlocale(locale.LC_ALL, str('English_United States.1252'))
-        except locale.Error:
-            warnings.warn(
-                "Could not set locale to English/United States. "
-                "Some date-related tests may fail")
-
-    use('Agg', warn=False)  # use Agg backend for these tests
-
-    # These settings *must* be hardcoded for running the comparison
-    # tests and are not necessarily the default values as specified in
-    # rcsetup.py
-    rcdefaults()  # Start with all defaults
-
-    set_font_settings_for_testing()
-
-
 def assert_str_equal(reference_str, test_str,
                      format_str=('String {str1} and {str2} do not '
                                  'match:\n{differences}')):
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)
