From 6387e89858a481cda584dd251d50b7b34ec2fd94 Mon Sep 17 00:00:00 2001 From: "C.A.M. Gerlach" Date: Wed, 3 Aug 2022 13:33:34 -0500 Subject: [PATCH 1/3] gh-91207: Fix CSS issue building docs for Windows CHM help --- Doc/conf.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Doc/conf.py b/Doc/conf.py index bf0af6a663c8b6..50a9f3ef35cde9 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -79,6 +79,11 @@ 'root_include_title': False # We use the version switcher instead. } +# Override stylesheet fingerprinting for Windows CHM htmlhelp to fix GH-91207 +# https://github.com/python/cpython/issues/91207 +if any('htmlhelp' in arg for arg in sys.argv): + html_style = 'pydoctheme.css' + # Short title used e.g. for HTML tags. html_short_title = '%s Documentation' % release From a3602491cecbc2d0e21ab548400d2117a77cf420 Mon Sep 17 00:00:00 2001 From: "C.A.M. Gerlach" <CAM.Gerlach@Gerlach.CAM> Date: Wed, 3 Aug 2022 13:46:31 -0500 Subject: [PATCH 2/3] gh-91207: Add deprecation message when building Windows CHM help docs --- Doc/conf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Doc/conf.py b/Doc/conf.py index 50a9f3ef35cde9..0a436d7affcdb6 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -83,6 +83,8 @@ # https://github.com/python/cpython/issues/91207 if any('htmlhelp' in arg for arg in sys.argv): html_style = 'pydoctheme.css' + print("\nWARNING: Windows CHM Help is no longer supported.") + print("It may be removed in the future\n") # Short title used e.g. for <title> HTML tags. html_short_title = '%s Documentation' % release From 124e72d4d182f0a313f7fb9f3f6277e76c7d401c Mon Sep 17 00:00:00 2001 From: "C.A.M. Gerlach" <CAM.Gerlach@Gerlach.CAM> Date: Wed, 3 Aug 2022 13:37:10 -0500 Subject: [PATCH 3/3] Add NEWS entry for gh-91207 --- .../2022-08-03-13-35-08.gh-issue-91207.eJ4pPf.rst | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Misc/NEWS.d/next/Documentation/2022-08-03-13-35-08.gh-issue-91207.eJ4pPf.rst diff --git a/Misc/NEWS.d/next/Documentation/2022-08-03-13-35-08.gh-issue-91207.eJ4pPf.rst b/Misc/NEWS.d/next/Documentation/2022-08-03-13-35-08.gh-issue-91207.eJ4pPf.rst new file mode 100644 index 00000000000000..8c7391f7edf78b --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2022-08-03-13-35-08.gh-issue-91207.eJ4pPf.rst @@ -0,0 +1,3 @@ +Fix stylesheet not working in Windows CHM htmlhelp docs +and add warning that they are deprecated. +Contributed by C.A.M. Gerlach.