matplotlib · QuLogic · Mar 27, 2017 · Feb 4, 2017 · Feb 6, 2017 · Feb 6, 2017
diff --git a/README.rst b/README.rst
@@ -13,7 +13,7 @@
 .. |PyPi| image:: https://badge.fury.io/py/matplotlib.svg
 .. _PyPi: https://badge.fury.io/py/matplotlib
 
-.. |Gitter| image:: https://img.shields.io/gitter/room/nwjs/nw.js.svg   
+.. |Gitter| image:: https://img.shields.io/gitter/room/nwjs/nw.js.svg
    :target: https://gitter.im/matplotlib/matplotlib?utm_source=share-link&utm_medium=link&utm_campaign=share-link
 
 .. |Depsy| image:: http://depsy.org/api/package/pypi/matplotlib/badge.svg

diff --git a/doc/api/api_changes/2017-02-06_TAC.rst b/doc/api/api_changes/2017-02-06_TAC.rst
@@ -0,0 +1,11 @@
+Do not clip line width when scaling dashes
+``````````````````````````````````````````
+
+The algorithm to scale dashes was changed to no longer clip the
+scaling factor: the dash patterns now continue to shrink at thin line widths.
+If the line width is smaller than the effective pixel size, this may result in
+dashed lines turning into solid gray-ish lines.  This also required slightly
+tweaking the default patterns for '--', ':', and '.-' so that with the default
+line width the final patterns would not change.
+
+There is no way to restore the old behavior.
diff --git a/doc/users/gridspec.rst b/doc/users/gridspec.rst
@@ -5,46 +5,47 @@
 Customizing Location of Subplot Using GridSpec
 **********************************************
 
-    ``GridSpec``
+    :class:`~matplotlib.gridspec.GridSpec`
         specifies the geometry of the grid that a subplot will be
         placed. The number of rows and number of columns of the grid
         need to be set. Optionally, the subplot layout parameters
         (e.g., left, right, etc.) can be tuned.
 
-    ``SubplotSpec``
+    :class:`~matplotlib.gridspec.SubplotSpec`
         specifies the location of the subplot in the given *GridSpec*.
 
-    ``subplot2grid``
-        a helper function that is similar to "pyplot.subplot" but uses
-        0-based indexing and let subplot to occupy multiple cells.
+    :func:`~matplotlib.pyplot.subplot2grid`
+        a helper function that is similar to :func:`~matplotlib.pyplot.subplot`
+        but uses 0-based indexing and let subplot to occupy multiple cells.
 
 
 Basic Example of using subplot2grid
 ===================================
 
-To use subplot2grid, you provide geometry of the grid and the location
-of the subplot in the grid. For a simple single-cell subplot::
+To use :func:`~matplotlib.pyplot.subplot2grid`, you provide geometry of
+the grid and the location of the subplot in the grid. For a simple
+single-cell subplot::
 
-  ax = plt.subplot2grid((2,2),(0, 0))
+  ax = plt.subplot2grid((2, 2), (0, 0))
 
 is identical to ::
 
-  ax = plt.subplot(2,2,1)
+  ax = plt.subplot(2, 2, 1)
 
-Note that, unlike matplotlib's subplot, the index starts from 0 in gridspec.
+Note that, unlike Matplotlib's subplot, the index starts from 0 in GridSpec.
 
 To create a subplot that spans multiple cells, ::
 
-  ax2 = plt.subplot2grid((3,3), (1, 0), colspan=2)
-  ax3 = plt.subplot2grid((3,3), (1, 2), rowspan=2)
+  ax2 = plt.subplot2grid((3, 3), (1, 0), colspan=2)
+  ax3 = plt.subplot2grid((3, 3), (1, 2), rowspan=2)
 
 For example, the following commands  ::
 
-  ax1 = plt.subplot2grid((3,3), (0,0), colspan=3)
-  ax2 = plt.subplot2grid((3,3), (1,0), colspan=2)
-  ax3 = plt.subplot2grid((3,3), (1, 2), rowspan=2)
-  ax4 = plt.subplot2grid((3,3), (2, 0))
-  ax5 = plt.subplot2grid((3,3), (2, 1))
+  ax1 = plt.subplot2grid((3, 3), (0, 0), colspan=3)
+  ax2 = plt.subplot2grid((3, 3), (1, 0), colspan=2)
+  ax3 = plt.subplot2grid((3, 3), (1, 2), rowspan=2)
+  ax4 = plt.subplot2grid((3, 3), (2, 0))
+  ax5 = plt.subplot2grid((3, 3), (2, 1))
 
 creates
 
@@ -54,47 +55,48 @@ creates
 GridSpec and SubplotSpec
 ========================
 
-You can create GridSpec explicitly and use them to create a Subplot.
+You can create :class:`~matplotlib.gridspec.GridSpec` explicitly and use
+them to create a subplot.
 
 For example, ::
 
-  ax = plt.subplot2grid((2,2),(0, 0))
+  ax = plt.subplot2grid((2, 2), (0, 0))
 
 is equal to ::
 
   import matplotlib.gridspec as gridspec
   gs = gridspec.GridSpec(2, 2)
   ax = plt.subplot(gs[0, 0])
 
-A gridspec instance provides array-like (2d or 1d) indexing that
-returns the SubplotSpec instance. For, SubplotSpec that spans multiple
+A GridSpec instance provides array-like (2d or 1d) indexing that
+returns the SubplotSpec instance. For a SubplotSpec that spans multiple
 cells, use slice. ::
 
-  ax2 = plt.subplot(gs[1,:-1])
+  ax2 = plt.subplot(gs[1, :-1])
   ax3 = plt.subplot(gs[1:, -1])
 
 The above example becomes ::
 
   gs = gridspec.GridSpec(3, 3)
   ax1 = plt.subplot(gs[0, :])
-  ax2 = plt.subplot(gs[1,:-1])
+  ax2 = plt.subplot(gs[1, :-1])
   ax3 = plt.subplot(gs[1:, -1])
-  ax4 = plt.subplot(gs[-1,0])
-  ax5 = plt.subplot(gs[-1,-2])
+  ax4 = plt.subplot(gs[-1, 0])
+  ax5 = plt.subplot(gs[-1, -2])
 
 .. plot:: users/plotting/examples/demo_gridspec02.py
 
 Adjust GridSpec layout
 ======================
 
 When a GridSpec is explicitly used, you can adjust the layout
-parameters of subplots that are created from the gridspec. ::
+parameters of subplots that are created from the GridSpec. ::
 
   gs1 = gridspec.GridSpec(3, 3)
   gs1.update(left=0.05, right=0.48, wspace=0.05)
 
-This is similar to *subplots_adjust*, but it only affects the subplots
-that are created from the given GridSpec.
+This is similar to :func:`~matplotlib.pyplot.subplots_adjust`, but it only
+affects the subplots that are created from the given GridSpec.
 
 The code below ::
 
@@ -117,8 +119,9 @@ creates
 GridSpec using SubplotSpec
 ==========================
 
-You can create GridSpec from the SubplotSpec, in which case its layout
-parameters are set to that of the location of the given SubplotSpec. ::
+You can create GridSpec from the :class:`~matplotlib.gridspec.SubplotSpec`,
+in which case its layout parameters are set to that of the location of
+the given SubplotSpec. ::
 
   gs0 = gridspec.GridSpec(1, 2)
 
@@ -132,8 +135,8 @@ parameters are set to that of the location of the given SubplotSpec. ::
 A Complex Nested GridSpec using SubplotSpec
 ===========================================
 
-Here's a more sophisticated example of nested gridspec where we put
-a box around each cell of the outer 4x4 grid, by hiding appropriate 
+Here's a more sophisticated example of nested GridSpec where we put
+a box around each cell of the outer 4x4 grid, by hiding appropriate
 spines in each of the inner 3x3 grids.
 
 .. plot:: users/plotting/examples/demo_gridspec06.py
@@ -147,8 +150,8 @@ relative heights and widths of rows and columns. Note that absolute
 values are meaningless, only their relative ratios matter. ::
 
   gs = gridspec.GridSpec(2, 2,
-                         width_ratios=[1,2],
-                         height_ratios=[4,1]
+                         width_ratios=[1, 2],
+                         height_ratios=[4, 1]
                          )
 
   ax1 = plt.subplot(gs[0])

diff --git a/examples/pylab_examples/demo_bboximage.py b/examples/pylab_examples/demo_bboximage.py
@@ -25,9 +25,11 @@
     a = np.linspace(0, 1, 256).reshape(1, -1)
     a = np.vstack((a, a))
 
-    maps = sorted(m for m in plt.cm.cmap_d if not m.endswith("_r"))
-    maps.remove('spectral')  # Deprecated.
-    #nmaps = len(maps) + 1
+    maps = sorted(
+        m for m in plt.cm.cmap_d
+        if not m.endswith("_r") and  # Skip reversed colormaps.
+        not m.startswith(('spectral', 'Vega'))  # Skip deprecated colormaps.
+    )
 
     #fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99)
 

diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -634,7 +634,7 @@ def _get_config_or_cache_dir(xdg_base):
     h = get_home()
     if h is not None:
         p = os.path.join(h, '.matplotlib')
-    if sys.platform.startswith('linux') or sys.platform.startswith('freebsd'):
+    if sys.platform.startswith(('linux', 'freebsd')):
         p = None
         if xdg_base is not None:
             p = os.path.join(xdg_base, 'matplotlib')

diff --git a/lib/matplotlib/afm.py b/lib/matplotlib/afm.py
@@ -57,12 +57,12 @@
 def _to_int(x):
     return int(float(x))
 
+
 _to_float = float
-if six.PY3:
-    def _to_str(x):
-        return x.decode('utf8')
-else:
-    _to_str = str
+
+
+def _to_str(x):
+    return x.decode('utf8')
 
 
 def _to_list_of_ints(s):

diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -278,9 +278,16 @@ def leaveEvent(self, event):
         FigureCanvasBase.leave_notify_event(self, guiEvent=event)
 
     def mouseEventCoords(self, pos):
-        x = pos.x() * self._dpi_ratio
+        """
+        Calculate mouse coordinates in logical pixels.
+
+        Qt5 and Matplotlib use logical pixels, but the figure is scaled to
+        physical pixels for rendering. Also, the origin is different and needs
+        to be corrected.
+        """
+        x = pos.x()
         # flip y so y=0 is bottom of canvas
-        y = self.figure.bbox.height - pos.y() * self._dpi_ratio
+        y = self.figure.bbox.height / self._dpi_ratio - pos.y()
         return x, y
 
     def mousePressEvent(self, event):