Address more minor comments in the PR

mdboom · mdboom · commit d6b22a5e2bb5 · 2016-02-17T09:47:58.000-05:00
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -1259,7 +1259,7 @@ def _unpack(self, im):
         """
         h, w = im.shape[:2]
         im = im[::-1]
-        if len(im.shape) == 2:
+        if im.ndim == 2:
             return h, w, im, None
         else:
             rgb = im[:, :, :3]
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -842,7 +842,7 @@ def draw_image(self, gc, x, y, im, transform=None):
 
             self.writer.element(
                 'image',
-                transform = generate_transform([
+                transform=generate_transform([
                     ('scale', (1, -1)), ('translate', (0, -h))]),
                 x=short_float_fmt(x),
                 y=short_float_fmt(-(self.height - y - h)),
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -281,7 +281,7 @@ def draw_image(self, gc, x, y, im):
             w = self.width
             h = self.height
         rows, cols = im.shape[:2]
-        bitmap = wxc.BitmapFromBuffer(cols, rows, im.tobytes())
+        bitmap = wxc.BitmapFromBuffer(cols, rows, im.tostring())
         gc = self.get_gc()
         gc.select()
         gc.gfx_ctx.DrawBitmap(bitmap, int(l), int(self.height - b),
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -127,10 +127,9 @@ def _draw_list_compositing_images(
     between `Figure.draw` and `Axes.draw`, but otherwise should not be
     generally useful.
     """
-    has_images = np.any(isinstance(x[1], _ImageBase) for x in dsu)
+    has_images = any(isinstance(x[1], _ImageBase) for x in dsu)
 
-    # override the renderer default if self.suppressComposite
-    # is not None
+    # override the renderer default if suppressComposite is not None
     not_composite = renderer.option_image_nocomposite()
     if suppress_composite is not None:
         not_composite = suppress_composite
@@ -277,7 +276,7 @@ def changed(self):
     def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                     unsampled=False, round_to_pixel_border=True):
         """
-        Normalize, rescale and color the image `A` to the given
+        Normalize, rescale and color the image `A` from the given
         in_bbox (in data space), to the given out_bbox (in pixel
         space) clipped to the given clip_bbox (also in pixel space),
         and magnified by the magnification factor.
diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py
@@ -163,8 +163,6 @@ def test_long_path():
                   extensions=['png'], remove_text=True)
 def test_agg_filter():
     def smooth1d(x, window_len):
-        # copied from http://www.scipy.org/Cookbook/SignalSmooth
-
         s = np.r_[2*x[0] - x[window_len:1:-1],
                   x,
                   2*x[-1] - x[-1:-window_len:-1]]
@@ -229,7 +227,6 @@ def get_pad(self, dpi):
             return int(self.sigma*3/72.*dpi)
 
         def process_image(self, padded_src, dpi):
-            #offsetx, offsety = int(self.offsets[0]), int(self.offsets[1])
             tgt_image = np.zeros_like(padded_src)
             aa = smooth2d(padded_src[:, :, -1]*self.alpha,
                           self.sigma/72.*dpi)
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -560,7 +560,7 @@ def test_log_scale_image():
     ax = fig.add_subplot(111)
 
     ax.imshow(Z, extent=[1, 100, 1, 100], cmap='viridis',
-              vmax=abs(Z).max(), vmin=-abs(Z).max())
+              vmax=1, vmin=-1)
     ax.set_yscale('log')
 
 
