From a6d97e200863e7e5fc60bbc8f121b86a2098ef2d Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Wed, 3 Jul 2019 18:39:49 -0400 Subject: Fix 3.6 documentation build for sphinx<1.6 (GH-14576) --- Doc/tools/extensions/suspicious.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Doc/tools/extensions/suspicious.py b/Doc/tools/extensions/suspicious.py index 8d80f6759b..dfcd0da9fd 100644 --- a/Doc/tools/extensions/suspicious.py +++ b/Doc/tools/extensions/suspicious.py @@ -50,6 +50,12 @@ from docutils import nodes from sphinx.builders import Builder import sphinx.util +try: # sphinx>=1.6 + from sphinx.util.logging import getLogger +except ImportError: # sphinx<1.6 + from logging import getLogger + + detect_all = re.compile(r''' ::(?=[^=])| # two :: (but NOT ::=) :[a-zA-Z][a-zA-Z0-9]+| # :foo @@ -86,7 +92,7 @@ class CheckSuspiciousMarkupBuilder(Builder): Checks for possibly invalid markup that may leak into the output. """ name = 'suspicious' - logger = sphinx.util.logging.getLogger("CheckSuspiciousMarkupBuilder") + logger = getLogger("CheckSuspiciousMarkupBuilder") def init(self): # create output file -- cgit v1.2.1