matplotlib
diff --git a/‎lib/matplotlib/contour.py
Lines changed: 26 additions & 7 deletions b/‎lib/matplotlib/contour.py
Lines changed: 26 additions & 7 deletions
diff --git a/‎lib/matplotlib/tests/baseline_images/test_contour/contour_manual_colors_and_levels.png
28 KB b/‎lib/matplotlib/tests/baseline_images/test_contour/contour_manual_colors_and_levels.png
28 KB
diff --git a/‎lib/matplotlib/tests/test_contour.py
Lines changed: 31 additions & 0 deletions b/‎lib/matplotlib/tests/test_contour.py
Lines changed: 31 additions & 0 deletions
@@ -864,7 +864,28 @@ def __init__(self, ax, *args, **kwargs):
             ncolors = len(self.levels)
             if self.filled:
                 ncolors -= 1
-            cmap = colors.ListedColormap(self.colors, N=ncolors)
+
+            # Handle the case where colors are given for the extended
+            # parts of the contour.
+            given_colors = self.colors
+            extend_min = self.extend in ['min', 'both']
+            extend_max = self.extend in ['max', 'both']
+            use_set_under_over = False
+            # if we are extending the lower end, and we've been given enough colors
+            # then skip the first color in the resulting cmap.
+            total_levels = ncolors + int(extend_min) + int(extend_max)
+            if len(self.colors) == total_levels and any([extend_min, extend_max]): 
+                use_set_under_over = True
+                if extend_min:
+                    given_colors = given_colors[1:]
+
+            cmap = colors.ListedColormap(given_colors, N=ncolors)
+            if use_set_under_over:
+                if extend_min:
+                    cmap.set_under(self.colors[0])
+                if extend_max:
+                    cmap.set_over(self.colors[-1])
+
         if self.filled:
             self.collections = cbook.silent_list('mcoll.PathCollection')
         else:
@@ -1172,16 +1193,16 @@ def _process_levels(self):
         # (Colorbar needs this even for line contours.)
         self._levels = list(self.levels)
 
-        if not self.filled:
-            self.layers = self.levels
-            return
-
         if self.extend in ('both', 'min'):
             self._levels.insert(0, min(self.levels[0], self.zmin) - 1)
         if self.extend in ('both', 'max'):
             self._levels.append(max(self.levels[-1], self.zmax) + 1)
         self._levels = np.asarray(self._levels)
 
+        if not self.filled:
+            self.layers = self.levels
+            return
+
         # layer values are mid-way between levels
         self.layers = 0.5 * (self._levels[:-1] + self._levels[1:])
         # ...except that extended layers must be outside the
@@ -1526,9 +1547,7 @@ def _check_xyz(self, args, kwargs):
             if y.shape != z.shape:
                 raise TypeError("Shape of y does not match that of z: found "
                                 "{0} instead of {1}.".format(y.shape, z.shape))
-
         else:
-
             raise TypeError("Inputs x and y must be 1D or 2D.")
 
         return x, y, z
 
@@ -149,3 +149,34 @@ def test_contour_manual_labels():
     cs = plt.contour(x,y,z)
     pts = np.array([(1.5, 3.0), (1.5, 4.4), (1.5, 6.0)])
     plt.clabel(cs, manual=pts)
+
+
+@image_comparison(baseline_images=['contour_manual_colors_and_levels'],
+                  extensions=['png'], remove_text=True)
+def test_given_colors_levels_and_extends():
+    _, axes = plt.subplots(2, 4)
+
+    data = np.arange(12).reshape(3, 4)
+    
+    colors = ['red', 'yellow', 'pink', 'blue', 'black']
+    levels = [2, 4, 8, 10]
+    
+    for i, ax in enumerate(axes.flatten()):
+        plt.sca(ax)
+        
+        filled = i % 2 == 0.
+        extend = ['neither', 'min', 'max', 'both'][i // 2]
+        
+        if filled:
+            last_color = -1 if extend in ['min', 'max'] else None
+            plt.contourf(data, colors=colors[:last_color], levels=levels, extend=extend)
+        else:
+            last_level = -1 if extend == 'both' else None
+            plt.contour(data, colors=colors, levels=levels[:last_level], extend=extend)
+    
+        plt.colorbar()
+
+
+if __name__ == '__main__':
+    import nose
+    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)