Merge pull request #16644 from anntzer/webagg_address

QuLogic · web-flow · commit d492a658c4d1 · 2020-03-10T23:23:41.000-04:00
Deprecate validate_webagg_address.
diff --git a/doc/api/next_api_changes/deprecations.rst b/doc/api/next_api_changes/deprecations.rst
@@ -225,11 +225,22 @@ The following validators, defined in `.rcsetup`, are deprecated:
 ``validate_movie_frame_fmt``, ``validate_axis_locator``,
 ``validate_movie_html_fmt``, ``validate_grid_axis``,
 ``validate_axes_titlelocation``, ``validate_toolbar``,
+<<<<<<< HEAD
 ``validate_ps_papersize``, ``validate_legend_loc``,
 ``validate_bool_maybe_none``, ``validate_hinting``,
 ``validate_movie_writers``.
 To test whether an rcParam value would be acceptable, one can test e.g. ``rc =
 RcParams(); rc[k] = v`` raises an exception.
+||||||| constructed merge base
+``validate_ps_papersize``, ``validate_legend_log``.  To test whether an rcParam
+value would be acceptable, one can test e.g. ``rc = RcParams(); rc[k] = v``
+raises an exception.
+=======
+``validate_ps_papersize``, ``validate_legend_loc``,
+``validate_webagg_address``.
+To test whether an rcParam value would be acceptable, one can test e.g. ``rc =
+RcParams(); rc[k] = v`` raises an exception.
+>>>>>>> Deprecate validate_webagg_address.
 
 Stricter rcParam validation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -992,6 +992,7 @@ def validate_animation_writer_path(p):
     return p
 
 
+@cbook.deprecated("3.3")
 def validate_webagg_address(s):
     if s is not None:
         import socket
@@ -1026,7 +1027,7 @@ def _convert_validator_spec(key, conv):
     'backend':           [_auto_backend_sentinel, validate_backend],
     'backend_fallback':  [True, validate_bool],
     'webagg.port':       [8988, validate_int],
-    'webagg.address':    ['127.0.0.1', validate_webagg_address],
+    'webagg.address':    ['127.0.0.1', validate_string],
     'webagg.open_in_browser': [True, validate_bool],
     'webagg.port_retries': [50, validate_int],
     'toolbar':           ['toolbar2', _ignorecase(['none', 'toolbar2', 'toolmanager'])],
