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

tacaswell · tacaswell · commit d399f250ef2d · 2016-03-28T15:37:47.000-04:00
diff --git a/examples/shapes_and_collections/artist_reference.py b/examples/shapes_and_collections/artist_reference.py
@@ -84,7 +84,7 @@ def label(xy, text):
     grid[7] - [0.025, 0.05], 0.05, 0.1,
     boxstyle=mpatches.BoxStyle("Round", pad=0.02))
 patches.append(fancybox)
-label(grid[7], "FancyBoxPatch")
+label(grid[7], "FancyBboxPatch")
 
 # add a line
 x, y = np.array([[-0.06, 0.0, 0.1], [0.05, -0.05, 0.05]])
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -642,7 +642,8 @@ class AutoDateFormatter(ticker.Formatter):
     dictionary by doing::
 
 
-    >>> formatter = AutoDateFormatter()
+    >>> locator = AutoDateLocator()
+    >>> formatter = AutoDateFormatter(locator)
     >>> formatter.scaled[1/(24.*60.)] = '%M:%S' # only show min and sec
 
     A custom :class:`~matplotlib.ticker.FuncFormatter` can also be used.
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -1879,7 +1879,7 @@ def register(klass, name, style):
 class BoxStyle(_Style):
     """
     :class:`BoxStyle` is a container class which defines several
-    boxstyle classes, which are used for :class:`FancyBoxPatch`.
+    boxstyle classes, which are used for :class:`FancyBboxPatch`.
 
     A style object can be created as::
 
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -242,6 +242,11 @@ def crop_to_same(actual_path, actual_image, expected_path, expected_image):
 
 def calculate_rms(expectedImage, actualImage):
     "Calculate the per-pixel errors, then compute the root mean square error."
+    if expectedImage.shape != actualImage.shape:
+        raise ImageComparisonFailure(
+            "image sizes do not match expected size: {0} "
+            "actual size {1}".format(expectedImage.shape, actualImage.shape))
+
     num_values = np.prod(expectedImage.shape)
     abs_diff_image = abs(expectedImage - actualImage)
 
