Simplify some comparisons

timhoffm · timhoffm · commit ed4d28de37ff · 2019-12-31T11:33:02.000+01:00
diff --git a/examples/images_contours_and_fields/image_zcoord.py b/examples/images_contours_and_fields/image_zcoord.py
@@ -27,7 +27,7 @@
 def format_coord(x, y):
     col = int(x + 0.5)
     row = int(y + 0.5)
-    if col >= 0 and col < numcols and row >= 0 and row < numrows:
+    if 0 <= col < numcols and 0 <= row < numrows:
         z = X[row, col]
         return 'x=%1.4f, y=%1.4f, z=%1.4f' % (x, y, z)
     else:
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -124,7 +124,7 @@ def draw_path(self, gc, path, transform, rgbFace=None):
         nmax = rcParams['agg.path.chunksize']  # here at least for testing
         npts = path.vertices.shape[0]
 
-        if (nmax > 100 and npts > nmax and path.should_simplify and
+        if (npts > nmax > 100 and path.should_simplify and
                 rgbFace is None and gc.get_hatch() is None):
             nch = np.ceil(npts / nmax)
             chsize = int(np.ceil(npts / nch))
diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py
@@ -352,7 +352,7 @@ def within_grid(self, xi, yi):
         """Return True if point is a valid index of grid."""
         # Note that xi/yi can be floats; so, for example, we can't simply check
         # `xi < self.nx` since *xi* can be `self.nx - 1 < xi < self.nx`
-        return xi >= 0 and xi <= self.nx - 1 and yi >= 0 and yi <= self.ny - 1
+        return 0 <= xi <= self.nx - 1 and 0 <= yi <= self.ny - 1
 
 
 class StreamMask:
