Merge pull request #7395 from anntzer/drop-numpy-pre16-compat

tacaswell · web-flow · commit 00b3b8fefb8e · 2016-11-03T08:56:34.000-04:00
MNT: Drop code that supports numpy pre-1.6.
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -254,22 +254,11 @@ def calculate_rms(expectedImage, actualImage):
         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)
-
-    # On Numpy 1.6, we can use bincount with minlength, which is much
-    # faster than using histogram
-    expected_version = version.LooseVersion("1.6")
-    found_version = version.LooseVersion(np.__version__)
-    if found_version >= expected_version:
-        histogram = np.bincount(abs_diff_image.ravel(), minlength=256)
-    else:
-        histogram = np.histogram(abs_diff_image, bins=np.arange(257))[0]
-
+    histogram = np.bincount(abs_diff_image.ravel(), minlength=256)
     sum_of_squares = np.sum(histogram * np.arange(len(histogram)) ** 2)
     rms = np.sqrt(float(sum_of_squares) / num_values)
-
     return rms
 
 
