Fix test on Python 3. Fixes #2080

mdboom · mdboom · commit f966e4a989c2 · 2013-05-29T12:44:09.000-04:00
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -122,7 +122,7 @@ def test_cmap_and_norm_from_levels_and_colors2():
     clr = mcolors.colorConverter.to_rgba_array(colors)
     bad = (0.1, 0.1, 0.1, 0.1)
     no_color = (0.0, 0.0, 0.0, 0.0)
-    masked_value = np.inf
+    masked_value = 'masked_value'
 
     # Define the test values which are of interest.
     # Note: levels are lev[i] <= v < lev[i+1]
@@ -163,10 +163,12 @@ def test_cmap_and_norm_from_levels_and_colors2():
         cmap, norm = mcolors.from_levels_and_colors(levels, colors[0:i1],
                                                     extend=extend)
         cmap.set_bad(bad)
-        for d_val, expected_color in sorted(cases.items()):
+        for d_val, expected_color in cases.items():
             if d_val == masked_value:
-                d_val = np.ma.array(1, mask=True)
-            assert_array_equal(expected_color, cmap(norm([d_val]))[0],
+                d_val = np.ma.array([1], mask=True)
+            else:
+                d_val = [d_val]
+            assert_array_equal(expected_color, cmap(norm(d_val))[0],
                                'Wih extend={0!r} and data '
                                'value={1!r}'.format(extend, d_val))
 
