matplotlib
diff --git a/‎lib/matplotlib/colorbar.py
Lines changed: 29 additions & 20 deletions b/‎lib/matplotlib/colorbar.py
Lines changed: 29 additions & 20 deletions
diff --git a/‎lib/matplotlib/contour.py
Lines changed: 1 addition & 1 deletion b/‎lib/matplotlib/contour.py
Lines changed: 1 addition & 1 deletion
@@ -470,11 +470,18 @@ def _add_solids(self, X, Y, C):
     def add_lines(self, levels, colors, linewidths):
         '''
         Draw lines on the colorbar.
+
+        *colors* and *linewidths* must be scalars or
+        sequences the same length as *levels*.
         '''
-        N = len(levels)
-        dummy, y = self._locate(levels)
-        if len(y) != N:
-            raise ValueError("levels are outside colorbar range")
+        y = self._locate(levels)
+        igood = (y < 1.001) & (y > -0.001)
+        y = y[igood]
+        if cbook.iterable(colors):
+            colors = np.asarray(colors)[igood]
+        if cbook.iterable(linewidths):
+            linewidths = np.asarray(linewidths)[igood]
+        N = len(y)
         x = np.array([0.0, 1.0])
         X, Y = np.meshgrid(x,y)
         if self.orientation == 'vertical':
@@ -528,7 +535,10 @@ def _ticker(self):
         locator.axis.get_minpos = lambda : intv[0]
         formatter.axis.get_minpos = lambda : intv[0]
         b = np.array(locator())
-        b, ticks = self._locate(b)
+        ticks = self._locate(b)
+        inrange = (ticks > -0.001) & (ticks < 1.001)
+        ticks = ticks[inrange]
+        b = b[inrange]
         formatter.set_locs(b)
         ticklabels = [formatter(t, i) for i, t in enumerate(b)]
         offset_string = formatter.get_offset()
@@ -746,37 +756,36 @@ def _mesh(self):
 
     def _locate(self, x):
         '''
-        Given a possible set of color data values, return the ones
-        within range, together with their corresponding colorbar
-        data coordinates.
+        Given a set of color data values, return their
+        corresponding colorbar data coordinates.
         '''
         if isinstance(self.norm, (colors.NoNorm, colors.BoundaryNorm)):
             b = self._boundaries
             xn = x
-            xout = x
         else:
             # Do calculations using normalized coordinates so
             # as to make the interpolation more accurate.
             b = self.norm(self._boundaries, clip=False).filled()
-            # We do our own clipping so that we can allow a tiny
-            # bit of slop in the end point ticks to allow for
-            # floating point errors.
             xn = self.norm(x, clip=False).filled()
-            in_cond = (xn > -0.001) & (xn < 1.001)
-            xn = np.compress(in_cond, xn)
-            xout = np.compress(in_cond, x)
-        # The rest is linear interpolation with clipping.
+        # The rest is linear interpolation with extrapolation at ends.
         y = self._y
         N = len(b)
-        ii = np.minimum(np.searchsorted(b, xn), N-1)
-        i0 = np.maximum(ii - 1, 0)
+        ii = np.searchsorted(b, xn)
+        i0 = ii - 1
+        itop = (ii == N)
+        ibot = (ii == 0)
+        i0[itop] -= 1
+        ii[itop] -= 1
+        i0[ibot] += 1
+        ii[ibot] += 1
+
         #db = b[ii] - b[i0]
         db = np.take(b, ii) - np.take(b, i0)
-        db = np.where(i0==ii, 1.0, db)
         #dy = y[ii] - y[i0]
         dy = np.take(y, ii) - np.take(y, i0)
         z = np.take(y, i0) + (xn-np.take(b,i0))*dy/db
-        return xout, z
+
+        return z
 
     def set_alpha(self, alpha):
         self.alpha = alpha
 
@@ -1091,7 +1091,7 @@ def _process_colors(self):
         line contours, when added to filled contours, take on
         colors that are consistent with those of the filled regions;
         for example, a contour line on the boundary between two
-        regions will have a color intermediate between the those
+        regions will have a color intermediate between those
         of the regions.
 
         """