From bf9e7579ef34b42698235cca02a8c442a9c9913a Mon Sep 17 00:00:00 2001 From: Cheryl Sabella Date: Fri, 2 Mar 2018 06:03:41 -0500 Subject: [PATCH 1/2] issue 6570: Update deprecated Sphinx html_use_smartypants --- spyder/utils/help/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spyder/utils/help/conf.py b/spyder/utils/help/conf.py index 00b86d9f984..f88c3e86422 100644 --- a/spyder/utils/help/conf.py +++ b/spyder/utils/help/conf.py @@ -97,10 +97,10 @@ # pages html_context = {} -# If true, SmartyPants will be used to convert quotes and dashes to +# If true, Smart Quotes will be used to convert quotes and dashes to # typographically correct entities. # Spyder: Disabled to fix conflict with qtwebview and mathjax. See issue #5514 -html_use_smartypants = False +smartquotes = False # If false, no module index is generated. html_use_modindex = False From 58b98d55a7f4aedd8f00d2e26c72e32eab6ea650 Mon Sep 17 00:00:00 2001 From: Cheryl Sabella Date: Sun, 4 Mar 2018 05:27:08 -0500 Subject: [PATCH 2/2] Use version for configuring option --- spyder/utils/help/conf.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spyder/utils/help/conf.py b/spyder/utils/help/conf.py index f88c3e86422..e2d8420f6a6 100644 --- a/spyder/utils/help/conf.py +++ b/spyder/utils/help/conf.py @@ -100,7 +100,10 @@ # If true, Smart Quotes will be used to convert quotes and dashes to # typographically correct entities. # Spyder: Disabled to fix conflict with qtwebview and mathjax. See issue #5514 -smartquotes = False +if sphinx_version < "1.7": + html_use_smartypants = False +else: + smartquotes = False # If false, no module index is generated. html_use_modindex = False