Use reshape instead of assigning to shape.

Author: anntzer

examples/axes_grid1/simple_axesgrid.py

@@ -2,8 +2,7 @@
 from mpl_toolkits.axes_grid1 import ImageGrid
 import numpy as np
 
-im = np.arange(100)
-im.shape = 10, 10
+im = np.arange(100).reshape((10, 10))
 
 fig = plt.figure(1, (4., 4.))
 grid = ImageGrid(fig, 111,  # similar to subplot(111)

examples/pylab_examples/agg_buffer.py

@@ -26,8 +26,7 @@
 l, b, w, h = agg.figure.bbox.bounds
 w, h = int(w), int(h)
 
-X = np.fromstring(s, np.uint8)
-X.shape = h, w, 3
+X = np.fromstring(s, np.uint8).reshape((h, w, 3))
 
 try:
     im = Image.fromstring("RGB", (w, h), s)

examples/pylab_examples/barcode_demo.py

@@ -14,15 +14,12 @@
 fig = plt.figure()
 
 # a vertical barcode -- this is broken at present
-x.shape = len(x), 1
 ax = fig.add_axes([0.1, 0.3, 0.1, 0.6], **axprops)
-ax.imshow(x, **barprops)
+ax.imshow(x.reshape((-1, 1)), **barprops)
 
-x = x.copy()
 # a horizontal barcode
-x.shape = 1, len(x)
 ax = fig.add_axes([0.3, 0.1, 0.6, 0.1], **axprops)
-ax.imshow(x, **barprops)
+ax.imshow(x.reshape((1, -1)), **barprops)
 
 
 plt.show()

examples/pylab_examples/figimage_demo.py

@@ -9,11 +9,10 @@
 
 
 fig = plt.figure()
-Z = np.arange(10000.0)
-Z.shape = 100, 100
-Z[:, 50:] = 1.
+Z = np.arange(10000).reshape(100, 100)
+Z[:, 50:] = 1
 
-im1 = plt.figimage(Z, xo=50, yo=0, origin='lower')
-im2 = plt.figimage(Z, xo=100, yo=100, alpha=.8, origin='lower')
+im1 = fig.figimage(Z, xo=50, yo=0, origin='lower')
+im2 = fig.figimage(Z, xo=100, yo=100, alpha=.8, origin='lower')
 
 plt.show()

examples/pylab_examples/image_demo2.py

@@ -7,9 +7,8 @@
 
 datafile = cbook.get_sample_data('ct.raw.gz', asfileobj=True)
 s = datafile.read()
-A = np.fromstring(s, np.uint16).astype(float)
-A *= 1.0 / max(A)
-A.shape = w, h
+A = np.fromstring(s, np.uint16).astype(float).reshape((w, h))
+A /= A.max()
 
 extent = (0, 25, 0, 25)
 im = plt.imshow(A, cmap=plt.cm.hot, origin='upper', extent=extent)

examples/pylab_examples/image_origin.py

@@ -7,8 +7,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-x = np.arange(120)
-x.shape = (10, 12)
+x = np.arange(120).reshape((10, 12))
 
 interp = 'bilinear'
 fig, axs = plt.subplots(nrows=2, sharex=True, figsize=(3, 5))

examples/pylab_examples/layer_images.py

@@ -28,8 +28,7 @@ def func3(x, y):
 extent = xmin, xmax, ymin, ymax
 fig = plt.figure(frameon=False)
 
-Z1 = np.array(([0, 1]*4 + [1, 0]*4)*4)
-Z1.shape = (8, 8)  # chessboard
+Z1 = np.add.outer(range(8), range(8)) % 2  # chessboard
 im1 = plt.imshow(Z1, cmap=plt.cm.gray, interpolation='nearest',
                  extent=extent)
 

examples/pylab_examples/mri_demo.py

@@ -9,8 +9,7 @@
 
 # Data are 256x256 16 bit integers
 dfile = cbook.get_sample_data('s1045.ima.gz')
-im = np.fromstring(dfile.read(), np.uint16).astype(float)
-im.shape = (256, 256)
+im = np.fromstring(dfile.read(), np.uint16).reshape((256, 256))
 dfile.close()
 
 ax.imshow(im, cmap=cm.gray)

examples/pylab_examples/mri_with_eeg.py

@@ -16,8 +16,7 @@
 
 # Load the MRI data (256x256 16 bit integers)
 dfile = cbook.get_sample_data('s1045.ima.gz')
-im = np.fromstring(dfile.read(), np.uint16).astype(float)
-im.shape = (256, 256)
+im = np.fromstring(dfile.read(), np.uint16).astype(float).reshape((256, 256))
 dfile.close()
 
 # Plot the MRI image

examples/user_interfaces/histogram_demo_canvasagg.py

@@ -48,8 +48,7 @@
 
 if 0:
     # convert to a numpy array
-    X = numpy.fromstring(s, numpy.uint8)
-    X.shape = h, w, 3
+    X = numpy.fromstring(s, numpy.uint8).reshape((h, w, 3))
 
 if 0:
     # pass off to PIL

lib/matplotlib/axes/_axes.py

@@ -4264,35 +4264,23 @@ def hexbin(self, x, y, C=None, gridsize=100, bins=None,
         d2 = (x - ix2 - 0.5) ** 2 + 3.0 * (y - iy2 - 0.5) ** 2
         bdist = (d1 < d2)
         if C is None:
-            accum = np.zeros(n)
-            # Create appropriate views into "accum" array.
-            lattice1 = accum[:nx1 * ny1]
-            lattice2 = accum[nx1 * ny1:]
-            lattice1.shape = (nx1, ny1)
-            lattice2.shape = (nx2, ny2)
+            lattice1 = np.zeros((nx1, ny1))
+            lattice2 = np.zeros((nx2, ny2))
 
             for i in xrange(len(x)):
                 if bdist[i]:
-                    if ((ix1[i] >= 0) and (ix1[i] < nx1) and
-                        (iy1[i] >= 0) and (iy1[i] < ny1)):
+                    if 0 <= ix1[i] < nx1 and 0 <= iy1[i] < ny1:
                         lattice1[ix1[i], iy1[i]] += 1
                 else:
-                    if ((ix2[i] >= 0) and (ix2[i] < nx2) and
-                        (iy2[i] >= 0) and (iy2[i] < ny2)):
+                    if 0 <= ix2[i] < nx2 and 0 <= iy2[i] < ny2:
                         lattice2[ix2[i], iy2[i]] += 1
 
             # threshold
             if mincnt is not None:
-                for i in xrange(nx1):
-                    for j in xrange(ny1):
-                        if lattice1[i, j] < mincnt:
-                            lattice1[i, j] = np.nan
-                for i in xrange(nx2):
-                    for j in xrange(ny2):
-                        if lattice2[i, j] < mincnt:
-                            lattice2[i, j] = np.nan
-            accum = np.hstack((lattice1.astype(float).ravel(),
-                               lattice2.astype(float).ravel()))
+                lattice1[lattice1 < mincnt] = np.nan
+                lattice2[lattice2 < mincnt] = np.nan
+            accum = np.hstack((lattice1.ravel(),
+                               lattice2.ravel()))
             good_idxs = ~np.isnan(accum)
 
         else:
@@ -4311,12 +4299,10 @@ def hexbin(self, x, y, C=None, gridsize=100, bins=None,
 
             for i in xrange(len(x)):
                 if bdist[i]:
-                    if ((ix1[i] >= 0) and (ix1[i] < nx1) and
-                        (iy1[i] >= 0) and (iy1[i] < ny1)):
+                    if 0 <= ix1[i] < nx1 and 0 <= iy1[i] < ny1:
                         lattice1[ix1[i], iy1[i]].append(C[i])
                 else:
-                    if ((ix2[i] >= 0) and (ix2[i] < nx2) and
-                        (iy2[i] >= 0) and (iy2[i] < ny2)):
+                    if 0 <= ix2[i] < nx2 and 0 <= iy2[i] < ny2:
                         lattice2[ix2[i], iy2[i]].append(C[i])
 
             for i in xrange(nx1):
@@ -6612,7 +6598,6 @@ def psd(self, x, NFFT=None, Fs=None, Fc=None, detrend=None,
         pxx, freqs = mlab.psd(x=x, NFFT=NFFT, Fs=Fs, detrend=detrend,
                               window=window, noverlap=noverlap, pad_to=pad_to,
                               sides=sides, scale_by_freq=scale_by_freq)
-        pxx.shape = len(freqs),
         freqs += Fc
 
         if scale_by_freq in (None, True):
@@ -6736,7 +6721,6 @@ def csd(self, x, y, NFFT=None, Fs=None, Fc=None, detrend=None,
         pxy, freqs = mlab.csd(x=x, y=y, NFFT=NFFT, Fs=Fs, detrend=detrend,
                               window=window, noverlap=noverlap, pad_to=pad_to,
                               sides=sides, scale_by_freq=scale_by_freq)
-        pxy.shape = len(freqs),
         # pxy is complex
         freqs += Fc
 

lib/matplotlib/backends/backend_gdk.py

@@ -134,7 +134,6 @@ def draw_image(self, gc, x, y, im):
                                   int(x), int(y), cols, rows,
                                   gdk.RGB_DITHER_NONE, 0, 0)
 
-
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         x, y = int(x), int(y)
 
@@ -158,54 +157,34 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
 
             self.gdkDrawable.draw_layout(gc.gdkGC, x, y-h-b, layout)
 
-
     def _draw_mathtext(self, gc, x, y, s, prop, angle):
         ox, oy, width, height, descent, font_image, used_characters = \
             self.mathtext_parser.parse(s, self.dpi, prop)
 
-        if angle==90:
+        if angle == 90:
             width, height = height, width
             x -= width
         y -= height
 
         imw = font_image.get_width()
         imh = font_image.get_height()
-        N = imw * imh
-
-        # a numpixels by num fonts array
-        Xall = np.zeros((N,1), np.uint8)
-
-        image_str = font_image.as_str()
-        Xall[:,0] = np.fromstring(image_str, np.uint8)
-
-        # get the max alpha at each pixel
-        Xs = np.amax(Xall,axis=1)
-
-        # convert it to it's proper shape
-        Xs.shape = imh, imw
 
         pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, has_alpha=True,
                                 bits_per_sample=8, width=imw, height=imh)
 
         array = pixbuf_get_pixels_array(pixbuf)
 
         rgb = gc.get_rgb()
-        array[:,:,0]=int(rgb[0]*255)
-        array[:,:,1]=int(rgb[1]*255)
-        array[:,:,2]=int(rgb[2]*255)
-        array[:,:,3]=Xs
-
-        try: # new in 2.2
-            # can use None instead of gc.gdkGC, if don't need clipping
-            self.gdkDrawable.draw_pixbuf (gc.gdkGC, pixbuf, 0, 0,
-                                          int(x), int(y), imw, imh,
-                                          gdk.RGB_DITHER_NONE, 0, 0)
-        except AttributeError:
-            # deprecated in 2.2
-            pixbuf.render_to_drawable(self.gdkDrawable, gc.gdkGC, 0, 0,
-                                  int(x), int(y), imw, imh,
-                                  gdk.RGB_DITHER_NONE, 0, 0)
+        array[:,:,0] = int(rgb[0]*255)
+        array[:,:,1] = int(rgb[1]*255)
+        array[:,:,2] = int(rgb[2]*255)
+        array[:,:,3] = (
+            np.fromstring(font_image.as_str(), np.uint8).reshape((imh, imw)))
 
+        # can use None instead of gc.gdkGC, if don't need clipping
+        self.gdkDrawable.draw_pixbuf(gc.gdkGC, pixbuf, 0, 0,
+                                     int(x), int(y), imw, imh,
+                                     gdk.RGB_DITHER_NONE, 0, 0)
 
     def _draw_rotated_text(self, gc, x, y, s, prop, angle):
         """
@@ -259,7 +238,6 @@ def _draw_rotated_text(self, gc, x, y, s, prop, angle):
         gdrawable.draw_image(ggc, imageVert, 0, 0, x, y, h, w)
         self.rotated[key] = imageVert
 
-
     def _get_pango_layout(self, s, prop):
         """
         Create a pango layout instance for Text 's' with properties 'prop'.
@@ -293,7 +271,6 @@ def _get_pango_layout(self, s, prop):
         self.layoutd[key] = layout, inkRect, logicalRect
         return layout, inkRect, logicalRect
 
-
     def flipy(self):
         return True
 
@@ -315,7 +292,6 @@ def get_text_width_height_descent(self, s, prop, ismath):
     def new_gc(self):
         return GraphicsContextGDK(renderer=self)
 
-
     def points_to_pixels(self, points):
         return points/72.0 * self.dpi
 

lib/matplotlib/backends/backend_webagg_core.py

@@ -207,8 +207,8 @@ def get_diff_image(self):
             # The buffer is created as type uint32 so that entire
             # pixels can be compared in one numpy call, rather than
             # needing to compare each plane separately.
-            buff = np.frombuffer(renderer.buffer_rgba(), dtype=np.uint32)
-            buff.shape = (renderer.height, renderer.width)
+            buff = (np.frombuffer(renderer.buffer_rgba(), dtype=np.uint32)
+                    .reshape((renderer.height, renderer.width)))
 
             # If any pixels have transparency, we need to force a full
             # draw as we cannot overlay new on top of old.
@@ -219,10 +219,9 @@ def get_diff_image(self):
                 output = buff
             else:
                 self.set_image_mode('diff')
-                last_buffer = np.frombuffer(self._last_renderer.buffer_rgba(),
-                                            dtype=np.uint32)
-                last_buffer.shape = (renderer.height, renderer.width)
-
+                last_buffer = (np.frombuffer(self._last_renderer.buffer_rgba(),
+                                             dtype=np.uint32)
+                               .reshape((renderer.height, renderer.width)))
                 diff = buff != last_buffer
                 output = np.where(diff, buff, 0)
 

lib/matplotlib/collections.py

@@ -83,9 +83,7 @@ class Collection(artist.Artist, cm.ScalarMappable):
     (i.e., a call to set_array has been made), at draw time a call to
     scalar mappable will be made to set the face colors.
     """
-    _offsets = np.array([], float)
-    # _offsets must be a Nx2 array!
-    _offsets.shape = (0, 2)
+    _offsets = np.zeros((0, 2))
     _transOffset = transforms.IdentityTransform()
     #: Either a list of 3x3 arrays or an Nx3x3 array of transforms, suitable
     #: for the `all_transforms` argument to
@@ -147,8 +145,7 @@ def __init__(self,
         self._uniform_offsets = None
         self._offsets = np.array([[0, 0]], float)
         if offsets is not None:
-            offsets = np.asanyarray(offsets)
-            offsets.shape = (-1, 2)             # Make it Nx2
+            offsets = np.asanyarray(offsets).reshape((-1, 2))
             if transOffset is not None:
                 self._offsets = offsets
                 self._transOffset = transOffset
@@ -213,11 +210,10 @@ def get_datalim(self, transData):
             offsets = transOffset.transform_non_affine(offsets)
             transOffset = transOffset.get_affine()
 
-        offsets = np.asanyarray(offsets, float)
+        offsets = np.asanyarray(offsets, float).reshape((-1, 2))
         if isinstance(offsets, np.ma.MaskedArray):
             offsets = offsets.filled(np.nan)
             # get_path_collection_extents handles nan but not masked arrays
-        offsets.shape = (-1, 2)                     # Make it Nx2
 
         if len(paths) and len(offsets):
             result = mpath.get_path_collection_extents(
@@ -255,8 +251,7 @@ def _prepare_points(self):
                 ys = self.convert_yunits(offsets[:, 1])
                 offsets = list(zip(xs, ys))
 
-        offsets = np.asanyarray(offsets, float)
-        offsets.shape = (-1, 2)             # Make it Nx2
+        offsets = np.asanyarray(offsets, float).reshape((-1, 2))
 
         if not transform.is_affine:
             paths = [transform.transform_path_non_affine(path)
@@ -436,8 +431,7 @@ def set_offsets(self, offsets):
 
         ACCEPTS: float or sequence of floats
         """
-        offsets = np.asanyarray(offsets, float)
-        offsets.shape = (-1, 2)             # Make it Nx2
+        offsets = np.asanyarray(offsets, float).reshape((-1, 2))
         #This decision is based on how they are initialized above
         if self._uniform_offsets is None:
             self._offsets = offsets
@@ -1889,8 +1883,7 @@ def draw(self, renderer):
                 ys = self.convert_yunits(self._offsets[:, 1])
                 offsets = list(zip(xs, ys))
 
-        offsets = np.asarray(offsets, float)
-        offsets.shape = (-1, 2)                 # Make it Nx2
+        offsets = np.asarray(offsets, float).reshape((-1, 2))
 
         self.update_scalarmappable()