Minor fixes following comments.

anntzer · anntzer · commit 78b4bccf7f3f · 2016-12-02T11:59:10.000-08:00
diff --git a/examples/pylab_examples/figimage_demo.py b/examples/pylab_examples/figimage_demo.py
@@ -9,7 +9,7 @@
 
 
 fig = plt.figure()
-Z = np.arange(10000).reshape(100, 100)
+Z = np.arange(10000).reshape((100, 100))
 Z[:, 50:] = 1
 
 im1 = fig.figimage(Z, xo=50, yo=0, origin='lower')
diff --git a/examples/pylab_examples/mri_with_eeg.py b/examples/pylab_examples/mri_with_eeg.py
@@ -16,7 +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).reshape((256, 256))
+im = np.fromstring(dfile.read(), np.uint16).reshape((256, 256))
 dfile.close()
 
 # Plot the MRI image
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -560,7 +560,8 @@ def close(self):
             {val[0]: val[1] for val in six.itervalues(self.alphaStates)})
         self.writeHatches()
         self.writeGouraudTriangles()
-        xobjects = dict(x[1:] for x in six.itervalues(self._images))
+        xobjects = {
+            name: ob for image, name, ob in six.itervalues(self._images)}
         for tup in six.itervalues(self.markers):
             xobjects[tup[0]] = tup[1]
         for name, value in six.iteritems(self.multi_byte_charprocs):
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -2068,16 +2068,10 @@ def unmasked_index_ranges(mask, compressed=True):
     ic1 = breakpoints
     return np.concatenate((ic0[:, np.newaxis], ic1[:, np.newaxis]), axis=1)
 
-# a dict to cross-map linestyle arguments
-_linestyles = [('-', 'solid'),
-               ('--', 'dashed'),
-               ('-.', 'dashdot'),
-               (':', 'dotted')]
-
-ls_mapper = dict(_linestyles)
-# The ls_mapper maps short codes for line style to their full name used
-# by backends
-# The reverse mapper is for mapping full names to short ones
+
+# The ls_mapper maps short codes for line style to their full name used by
+# backends; the reverse mapper is for mapping full names to short ones.
+ls_mapper = {'-': 'solid', '--': 'dashed', '-.': 'dashdot', ':': 'dotted'}
 ls_mapper_r = reverse_dict(ls_mapper)
 
 
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -657,7 +657,7 @@ def _make_verts(self, U, V):
             theta = np.angle(uv)
         else:
             theta = ma.masked_invalid(np.deg2rad(self.angles)).filled(0)
-            theta = theta.reshape((-1, 1))  # for broadcasting
+        theta = theta.reshape((-1, 1))  # for broadcasting
         xy = (X + Y * 1j) * np.exp(1j * theta) * self.width
         xy = xy[:, :, np.newaxis]
         XY = np.concatenate((xy.real, xy.imag), axis=2)
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1550,8 +1550,9 @@ def view_limits(self, vmin, vmax):
             vmax += 1
 
         if rcParams['axes.autolimit_mode'] == 'round_numbers':
-            exponent = round(math.log10(vmax - vmin)
-                             / math.log10(max(self.numticks - 1, 1))) - 1
+            exponent, remainder = _divmod(
+                math.log10(vmax - vmin), math.log10(max(self.numticks - 1, 1)))
+            exponent -= (remainder < .5)
             scale = max(self.numticks - 1, 1) ** (-exponent)
             vmin = math.floor(scale * vmin) / scale
             vmax = math.ceil(scale * vmax) / scale
