From 2397e947a06b5a072da83bb3f09d2ce0824ae292 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Thu, 7 Nov 2019 15:24:56 +0100 Subject: [PATCH] Cleanup mpl_toolkits locators. mpl_toolkits locators have a separate API from "normal" Locators. Work towards unifying them by deprecating the unused set_factor method. Also remove a branch for the never-unset _ignore_factor attribute of FormatterPrettyPrint. --- doc/api/next_api_changes/deprecations.rst | 5 +++++ lib/mpl_toolkits/axisartist/grid_finder.py | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/api/next_api_changes/deprecations.rst b/doc/api/next_api_changes/deprecations.rst index 55a7b1f41dfd..f0ca5af5d531 100644 --- a/doc/api/next_api_changes/deprecations.rst +++ b/doc/api/next_api_changes/deprecations.rst @@ -344,3 +344,8 @@ PGF backend cleanups The *dummy* parameter of `.RendererPgf` is deprecated. `.GraphicsContextPgf` is deprecated (use `.GraphicsContextBase` instead). + +``set_factor`` method of :mod:`mpl_toolkits.axisartist` locators +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +The ``set_factor`` method of :mod:`mpl_toolkits.axisartist` locators (which are +different from "standard" Matplotlib tick locators) is deprecated. diff --git a/lib/mpl_toolkits/axisartist/grid_finder.py b/lib/mpl_toolkits/axisartist/grid_finder.py index d6bfdcc84a83..6c9595a91542 100644 --- a/lib/mpl_toolkits/axisartist/grid_finder.py +++ b/lib/mpl_toolkits/axisartist/grid_finder.py @@ -238,6 +238,7 @@ def __call__(self, v1, v2): locs = mticker.MaxNLocator.__call__(self) return np.array(locs), len(locs), self._factor + @cbook.deprecated("3.3") def set_factor(self, f): self._factor = _deprecate_factor_none(f) @@ -252,6 +253,7 @@ def __call__(self, v1, v2): locs = np.array([l for l in self._locs if v1 <= l <= v2]) return locs, len(locs), self._factor + @cbook.deprecated("3.3") def set_factor(self, f): self._factor = _deprecate_factor_none(f) @@ -263,11 +265,8 @@ def __init__(self, useMathText=True): self._fmt = mticker.ScalarFormatter( useMathText=useMathText, useOffset=False) self._fmt.create_dummy_axis() - self._ignore_factor = True def __call__(self, direction, factor, values): - if not self._ignore_factor: - values = [v / _deprecate_factor_none(factor) for v in values] return self._fmt.format_ticks(values)