Merge branch 'master' of https://github.com/matplotlib/matplotlib into issue_10267

esvhd · esvhd · commit a98cabc3ba92 · 2018-01-31T21:22:36.000Z
diff --git a/doc/citing.rst b/doc/citing.rst
@@ -7,7 +7,7 @@ If Matplotlib contributes to a project that leads to a scientific
 publication, please acknowledge this fact by citing `Hunter et al (2007)
 <http://doi.org/10.1109/MCSE.2007.55>`_ using this ready-made BibTeX entry:
 
-.. code:: bibtex
+.. code-block:: bibtex
 
    @Article{Hunter:2007,
      Author    = {Hunter, J. D.},
diff --git a/doc/faq/osx_framework.rst b/doc/faq/osx_framework.rst
@@ -7,6 +7,7 @@ Working with Matplotlib on OSX
 .. contents::
    :backlinks: none
 
+.. highlight:: bash
 
 .. _osxframework_introduction:
 
@@ -77,9 +78,7 @@ Until this is fixed, one of the following workarounds can be used:
 
 The best known work around is to use the non
 virtualenv python along with the PYTHONHOME environment variable.
-This can be done by defining a function in your ``.bashrc`` using
-
-.. code:: bash
+This can be done by defining a function in your ``.bashrc`` using ::
 
   function frameworkpython {
       if [[ ! -z "$VIRTUAL_ENV" ]]; then
@@ -115,9 +114,7 @@ An alternative work around borrowed from the `WX wiki
 virtualenv python along with the PYTHONHOME environment variable.  This can be
 implemented in a script as below. To use this modify ``PYVER`` and
 ``PATHTOPYTHON`` and put the script in the virtualenv bin directory i.e.
-``PATHTOVENV/bin/frameworkpython``
-
-.. code:: bash
+``PATHTOVENV/bin/frameworkpython`` ::
 
   #!/bin/bash
 
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -305,7 +305,8 @@ def set_clim(self, vmin=None, vmax=None):
         sequence, interpret it as ``(vmin, vmax)`` which is used to
         support setp
 
-        ACCEPTS: a length 2 sequence of floats
+        ACCEPTS: a length 2 sequence of floats; may be overridden in methods
+        that have ``vmin`` and ``vmax`` kwargs.
         """
         if vmax is None:
             try:
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -267,27 +267,26 @@ def validate_backend(s):
 
 
 def validate_qt4(s):
-    # Don't spam the test suite with warnings every time the rcparams are
-    # reset.  While it may seem better to use filterwarnings from within the
-    # test suite, pytest 3.1+ explicitly disregards warnings filters (pytest
-    # issue #2430).
-    if not testing.is_called_from_pytest():
-        cbook.warn_deprecated(
-            "2.2",
-            "The backend.qt4 rcParam was deprecated in version 2.2.  In order "
-            "to force the use of a specific Qt4 binding, either import that "
-            "binding first, or set the QT_API environment variable.")
+    if s is None:
+        # return a reasonable default for deprecation period
+        return 'PyQt4'
+    cbook.warn_deprecated(
+        "2.2",
+        "The backend.qt4 rcParam was deprecated in version 2.2.  In order "
+        "to force the use of a specific Qt4 binding, either import that "
+        "binding first, or set the QT_API environment variable.")
     return ValidateInStrings("backend.qt4", ['PyQt4', 'PySide', 'PyQt4v2'])(s)
 
 
 def validate_qt5(s):
-    # See comment re: validate_qt4.
-    if not testing.is_called_from_pytest():
-        cbook.warn_deprecated(
-            "2.2",
-            "The backend.qt5 rcParam was deprecated in version 2.2.  In order "
-            "to force the use of a specific Qt5 binding, either import that "
-            "binding first, or set the QT_API environment variable.")
+    if s is None:
+        # return a reasonable default for deprecation period
+        return 'PyQt5'
+    cbook.warn_deprecated(
+        "2.2",
+        "The backend.qt5 rcParam was deprecated in version 2.2.  In order "
+        "to force the use of a specific Qt5 binding, either import that "
+        "binding first, or set the QT_API environment variable.")
     return ValidateInStrings("backend.qt5", ['PyQt5', 'PySide2'])(s)
 
 
@@ -958,8 +957,8 @@ def _validate_linestyle(ls):
     'backend':           ['Agg', validate_backend],  # agg is certainly
                                                       # present
     'backend_fallback':  [True, validate_bool],  # agg is certainly present
-    'backend.qt4':       ['PyQt4', validate_qt4],
-    'backend.qt5':       ['PyQt5', validate_qt5],
+    'backend.qt4':       [None, validate_qt4],
+    'backend.qt5':       [None, validate_qt5],
     'webagg.port':       [8988, validate_int],
     'webagg.address':    ['127.0.0.1', validate_webagg_address],
     'webagg.open_in_browser': [True, validate_bool],
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -40,11 +40,6 @@
 # non-interactive backend.
 backend      : $TEMPLATE_BACKEND
 
-# If you are using the Qt4Agg backend, you can choose here
-# to use the PyQt4 bindings or the newer PySide bindings to
-# the underlying Qt4 toolkit.
-#backend.qt4 : PyQt4        # PyQt4 | PySide
-
 # Note that this can be overridden by the environment variable
 # QT_API used by Enthought Tool Suite (ETS); valid values are
 # "pyqt" and "pyside".  The "pyqt" setting has the side effect of
diff --git a/tutorials/introductory/images.py b/tutorials/introductory/images.py
@@ -32,7 +32,7 @@
 notebook.  This has important implications for interactivity.  For inline plotting, commands in
 cells below the cell that outputs a plot will not affect the plot.  For example,
 changing the color map is not possible from cells below the cell that creates a plot.
-However, for other backends, such as qt4, that open a separate window,
+However, for other backends, such as Qt5, that open a separate window,
 cells below those that create the plot will change the plot - it is a
 live object in memory.
 
@@ -266,7 +266,7 @@
 imgplot = plt.imshow(img, interpolation="nearest")
 
 ###############################################################################
-# and bucibic:
+# and bicubic:
 
 imgplot = plt.imshow(img, interpolation="bicubic")
 
diff --git a/tutorials/introductory/usage.py b/tutorials/introductory/usage.py
@@ -495,13 +495,8 @@ def my_plotter(ax, data1, data2, param_dict):
 # How do I select PyQt4 or PySide?
 # --------------------------------
 #
-# You can choose either PyQt4 or PySide when using the `qt4` backend by setting
-# the appropriate value for `backend.qt4` in your :file:`matplotlibrc` file. The
-# default value is `PyQt4`.
-#
-# The setting in your :file:`matplotlibrc` file can be overridden by setting the
-# `QT_API` environment variable to either `pyqt` or `pyside` to use `PyQt4` or
-# `PySide`, respectively.
+# The `QT_API` environment variable can be set to either `pyqt` or `pyside`
+# to use `PyQt4` or `PySide`, respectively.
 #
 # Since the default value for the bindings to be used is `PyQt4`,
 # :mod:`matplotlib` first tries to import it, if the import fails, it tries to
