More alternatives in API changes

timhoffm · anntzer · commit 6ca5ce611de1 · 2018-11-13T14:13:09.000+01:00
diff --git a/doc/api/next_api_changes/2018-09-18-AL-removals.rst b/doc/api/next_api_changes/2018-09-18-AL-removals.rst
@@ -5,30 +5,43 @@ The following deprecated APIs were removed:
 
 Classes and methods
 -------------------
-- ``Verbose``
-- ``artist.Artist.hitlist``
+- ``Verbose`` (replaced by python logging library)
+- ``artist.Artist.hitlist`` (no replacement)
 - ``artist.Artist.is_figure_set`` (use ``artist.figure is not None`` instead)
 - ``axis.Axis.unit_data`` (use ``axis.Axis.units`` instead)
-- ``backend_bases.FigureCanvasBase.onRemove``
+- ``backend_bases.FigureCanvasBase.onRemove`` (no replacement)
   ``backend_bases.FigureManagerBase.show_popup`` (this never did anything)
-- ``backend_wx.SubplotToolWx``, ``backend_wx.Toolbar``
-- ``cbook.align_iterators``
-- ``contour.ContourLabeler.get_real_label_width``
+- ``backend_wx.SubplotToolWx`` (no replacement)
+- ``backend_wx.Toolbar`` (use ``backend_wx.NavigationToolbar2Wx`` instead)
+- ``cbook.align_iterators`` (no replacment)
+- ``contour.ContourLabeler.get_real_label_width`` (no replacement)
 - ``legend.Legend.draggable`` (use `legend.Legend.set_draggable()` instead)
 - ``texmanager.TexManager.postscriptd``, ``texmanager.TexManager.pscnt``,
   ``texmanager.TexManager.make_ps``, ``texmanager.TexManager.get_ps_bbox``
+  (no replacements)
 
 Arguments
 ---------
 - The ``fig`` kwarg to ``GridSpec.get_subplot_params`` and
-  ``GridSpecFromSubplotSpec.get_subplot_params``
-- Passing 'box-forced' to `axes.Axes.set_adjustable`
-- Support for the strings 'on'/'true'/'off'/'false' to mean ``True``/``False``
-  the following functions are affected: `Axes.grid`, `Axes3D.grid`
-  `Axis.set_tick_params`, `pyplot.box`)
+  ``GridSpecFromSubplotSpec.get_subplot_params`` (use the argument
+  ``figure`` instead)
+- Passing 'box-forced' to `axes.Axes.set_adjustable` (use 'box' instead)
+- Support for the strings 'on'/'true'/'off'/'false' to mean
+  ``True``/``False`` (directly use ``True``/``False`` instead).
+  The following functions are affected: `Axes.grid`, `Axes3D.grid`
+  `Axis.set_tick_params`, `pyplot.box`.
 - Using `pyplot.axes` with an `axes.Axes` type argument
   (use `pyplot.sca` instead)
 
 Other
 -----
 - svgfont support (in :rc:`svg.fonttype`),
+- Logging is now done with the standard python ``logging`` library.
+  ``matplotlib.verbose`` and the command line switches ``--verbose-LEVEL`` are
+  removed.
+
+  To control the logging output use::
+
+    import logging
+    logger = logging.getLogger('matplotlib')
+    logger.set_level(logging.INFO)
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1474,7 +1474,7 @@ def apply_aspect(self, position=None):
 
         figW, figH = self.get_figure().get_size_inches()
         fig_aspect = figH / figW
-        if self._adjustable in ['box', 'box-forced']:
+        if self._adjustable == 'box-forced':
             if self in self._twinned_axes:
                 raise RuntimeError("Adjustable 'box' is not allowed in a"
                                    " twinned Axes.  Use 'datalim' instead.")
