From 65bbec02be8cc27f03be4c3ca1ec06c699886de8 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 22 Aug 2022 20:55:09 -0400 Subject: [PATCH] Fix deprecation messages for vendoring unused things Formerly, the deprecation message would say "Use Vendor the code instead"; now they say "Use a vendored copy of the code instead", etc. --- lib/matplotlib/__init__.py | 2 +- lib/matplotlib/backends/backend_pdf.py | 2 +- lib/matplotlib/backends/backend_ps.py | 2 +- lib/matplotlib/backends/backend_svg.py | 8 ++++---- lib/matplotlib/testing/decorators.py | 12 ++++++------ lib/mpl_toolkits/mplot3d/axis3d.py | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 50033b212a93..fd78e6f94f19 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -436,7 +436,7 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False): raise ValueError("Unknown executable: {!r}".format(name)) -@_api.deprecated("3.6", alternative="Vendor the code") +@_api.deprecated("3.6", alternative="a vendored copy of this function") def checkdep_usetex(s): if not s: return False diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index dc72a111c9ba..a3ea5dac6e43 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -92,7 +92,7 @@ # * draw_quad_mesh -@_api.deprecated("3.6", alternative="Vendor the code") +@_api.deprecated("3.6", alternative="a vendored copy of _fill") def fill(strings, linelen=75): return _fill(strings, linelen=linelen) diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py index 6cb8d19d5605..f209e811f18b 100644 --- a/lib/matplotlib/backends/backend_ps.py +++ b/lib/matplotlib/backends/backend_ps.py @@ -87,7 +87,7 @@ def _nums_to_str(*args): return " ".join(f"{arg:1.3f}".rstrip("0").rstrip(".") for arg in args) -@_api.deprecated("3.6", alternative="Vendor the code") +@_api.deprecated("3.6", alternative="a vendored copy of this function") def quote_ps_string(s): """ Quote dangerous characters of S for use in a PostScript string constant. diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py index cced5a555a18..7d94c429eed7 100644 --- a/lib/matplotlib/backends/backend_svg.py +++ b/lib/matplotlib/backends/backend_svg.py @@ -66,7 +66,7 @@ # -------------------------------------------------------------------- -@_api.deprecated("3.6", alternative="Vendor the code") +@_api.deprecated("3.6", alternative="a vendored copy of _escape_cdata") def escape_cdata(s): return _escape_cdata(s) @@ -81,7 +81,7 @@ def _escape_cdata(s): _escape_xml_comment = re.compile(r'-(?=-)') -@_api.deprecated("3.6", alternative="Vendor the code") +@_api.deprecated("3.6", alternative="a vendored copy of _escape_comment") def escape_comment(s): return _escape_comment.sub(s) @@ -91,7 +91,7 @@ def _escape_comment(s): return _escape_xml_comment.sub('- ', s) -@_api.deprecated("3.6", alternative="Vendor the code") +@_api.deprecated("3.6", alternative="a vendored copy of _escape_attrib") def escape_attrib(s): return _escape_attrib(s) @@ -111,7 +111,7 @@ def _quote_escape_attrib(s): '"' + _escape_attrib(s) + '"') -@_api.deprecated("3.6", alternative="Vendor the code") +@_api.deprecated("3.6", alternative="a vendored copy of _short_float_fmt") def short_float_fmt(x): return _short_float_fmt(x) diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py index 86f09d176d65..46dfcf992baa 100644 --- a/lib/matplotlib/testing/decorators.py +++ b/lib/matplotlib/testing/decorators.py @@ -32,8 +32,8 @@ def _cleanup_cm(): plt.close("all") -@_api.deprecated("3.6", alternative="Vendor the existing code, " - "including the private function _cleanup_cm.") +@_api.deprecated("3.6", alternative="a vendored copy of the existing code, " + "including the private function _cleanup_cm") class CleanupTestCase(unittest.TestCase): """A wrapper for unittest.TestCase that includes cleanup operations.""" @classmethod @@ -45,8 +45,8 @@ def tearDownClass(cls): cls._cm.__exit__(None, None, None) -@_api.deprecated("3.6", alternative="Vendor the existing code, " - "including the private function _cleanup_cm.") +@_api.deprecated("3.6", alternative="a vendored copy of the existing code, " + "including the private function _cleanup_cm") def cleanup(style=None): """ A decorator to ensure that any global state is reset before @@ -88,8 +88,8 @@ def wrapped_callable(*args, **kwargs): return make_cleanup -@_api.deprecated("3.6", alternative="Vendor the existing code " - "of _check_freetype_version.") +@_api.deprecated("3.6", alternative="a vendored copy of the existing code " + "of _check_freetype_version") def check_freetype_version(ver): return _check_freetype_version(ver) diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py index 9734c92d5c68..efb3ced73048 100644 --- a/lib/mpl_toolkits/mplot3d/axis3d.py +++ b/lib/mpl_toolkits/mplot3d/axis3d.py @@ -13,7 +13,7 @@ from . import art3d, proj3d -@_api.deprecated("3.6", alternative="Vendor the code of _move_from_center") +@_api.deprecated("3.6", alternative="a vendored copy of _move_from_center") def move_from_center(coord, centers, deltas, axmask=(True, True, True)): """ For each coordinate where *axmask* is True, move *coord* away from @@ -31,7 +31,7 @@ def _move_from_center(coord, centers, deltas, axmask=(True, True, True)): return coord + axmask * np.copysign(1, coord - centers) * deltas -@_api.deprecated("3.6", alternative="Vendor the code of _tick_update_position") +@_api.deprecated("3.6", alternative="a vendored copy of _tick_update_position") def tick_update_position(tick, tickxs, tickys, labelpos): """Update tick line and label position and style.""" _tick_update_position(tick, tickxs, tickys, labelpos) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy