diff --git a/doc/source/whatsnew/v0.25.0.rst b/doc/source/whatsnew/v0.25.0.rst index 32faf7115f0fd..276812a564e03 100644 --- a/doc/source/whatsnew/v0.25.0.rst +++ b/doc/source/whatsnew/v0.25.0.rst @@ -315,6 +315,7 @@ Removal of prior version deprecations/changes - Removed the previously deprecated ``sheetname`` keyword in :func:`read_excel` (:issue:`16442`, :issue:`20938`) - Removed the previously deprecated ``TimeGrouper`` (:issue:`16942`) - Removed the previously deprecated ``parse_cols`` keyword in :func:`read_excel` (:issue:`16488`) +- Removed the previously deprecated ``pd.options.html.border`` (:issue:`16970`) .. _whatsnew_0250.performance: diff --git a/pandas/core/config_init.py b/pandas/core/config_init.py index dc63b15cf9c13..7eb2b413822d9 100644 --- a/pandas/core/config_init.py +++ b/pandas/core/config_init.py @@ -185,11 +185,6 @@ def use_numexpr_cb(key): for the DataFrame HTML repr. """ -pc_html_border_deprecation_warning = """\ -html.border has been deprecated, use display.html.border instead -(currently both are identical) -""" - pc_html_use_mathjax_doc = """\ : boolean When True, Jupyter notebook will process table contents using MathJax, @@ -363,14 +358,6 @@ def is_terminal(): cf.register_option('html.use_mathjax', True, pc_html_use_mathjax_doc, validator=is_bool) -with cf.config_prefix('html'): - cf.register_option('border', 1, pc_html_border_doc, - validator=is_int) - -cf.deprecate_option('html.border', msg=pc_html_border_deprecation_warning, - rkey='display.html.border') - - tc_sim_interactive_doc = """ : boolean Whether to simulate interactive mode for purposes of testing diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 7cf200506e853..963da247fcaa5 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -2160,7 +2160,7 @@ def to_html(self, buf=None, columns=None, col_space=None, header=True, Whether the generated HTML is for IPython Notebook. border : int A ``border=border`` attribute is included in the opening - `` tag. Default ``pd.options.html.border``. + `
` tag. Default ``pd.options.display.html.border``. .. versionadded:: 0.19.0 diff --git a/pandas/io/formats/format.py b/pandas/io/formats/format.py index 1c1acebb8f8f7..765b31f294bcb 100644 --- a/pandas/io/formats/format.py +++ b/pandas/io/formats/format.py @@ -729,7 +729,7 @@ def to_html(self, classes=None, notebook=False, border=None): Whether the generated HTML is for IPython Notebook. border : int A ``border=border`` attribute is included in the opening - ``
`` tag. Default ``pd.options.html.border``. + ``
`` tag. Default ``pd.options.display.html.border``. .. versionadded:: 0.19.0 """ diff --git a/pandas/tests/io/formats/test_to_html.py b/pandas/tests/io/formats/test_to_html.py index eb71dd4c6914c..9666bc4977587 100644 --- a/pandas/tests/io/formats/test_to_html.py +++ b/pandas/tests/io/formats/test_to_html.py @@ -244,12 +244,6 @@ def test_to_html_border(option, result, expected): assert expected in result -def test_display_option_warning(): - with tm.assert_produces_warning(FutureWarning, - check_stacklevel=False): - pd.options.html.border - - @pytest.mark.parametrize('biggie_df_fixture', ['mixed'], indirect=True) def test_to_html(biggie_df_fixture): # TODO: split this test