Minor cleanups.

anntzer · efiring · commit b73a93936096 · 2016-11-24T11:24:20.000-10:00
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -262,8 +262,8 @@ def limit_range_for_scale(self, vmin, vmax, minpos):
         """
         Limit the domain to positive values.
         """
-        return (vmin <= 0.0 and minpos or vmin,
-                vmax <= 0.0 and minpos or vmax)
+        return (minpos if vmin <= 0 else vmin,
+                minpos if vmax <= 0 else vmax)
 
 
 class SymmetricalLogTransform(Transform):
@@ -497,8 +497,8 @@ def limit_range_for_scale(self, vmin, vmax, minpos):
         """
         Limit the domain to values between 0 and 1 (excluded).
         """
-        return (vmin <= 0 and minpos or vmin,
-                vmax >= 1 and (1 - minpos) or vmax)
+        return (minpos if vmin <= 0 else minpos,
+                1 - minpos if vmax >= 1 else vmax)
 
 
 _scale_mapping = {
diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py
@@ -156,10 +156,10 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
 
         # Check if start_points are outside the data boundaries
         for xs, ys in sp2:
-            if (xs < grid.x_origin or xs > grid.x_origin + grid.width
-                or ys < grid.y_origin or ys > grid.y_origin + grid.height):
-                    raise ValueError("Starting point ({}, {}) outside of"
-                                     " data boundaries".format(xs, ys))
+            if not (grid.x_origin <= xs <= grid.x_origin + grid.width
+                    and grid.y_origin <= ys <= grid.y_origin + grid.height):
+                raise ValueError("Starting point ({}, {}) outside of data "
+                                 "boundaries".format(xs, ys))
 
         # Convert start_points from data to array coords
         # Shift the seed points from the bottom left of the data so that
