[Python-checkins] Fix 3.6 documentation build for sphinx<1.6 (GH-14576)
Ned Deily
webhook-mailer at python.org
Wed Jul 3 18:40:10 EDT 2019
https://github.com/python/cpython/commit/a6d97e200863e7e5fc60bbc8f121b86a2098ef2d
commit: a6d97e200863e7e5fc60bbc8f121b86a2098ef2d
branch: 3.6
author: Anthony Sottile <asottile at umich.edu>
committer: Ned Deily <nad at python.org>
date: 2019-07-03T18:39:48-04:00
summary:
Fix 3.6 documentation build for sphinx<1.6 (GH-14576)
files:
M Doc/tools/extensions/suspicious.py
diff --git a/Doc/tools/extensions/suspicious.py b/Doc/tools/extensions/suspicious.py
index 8d80f6759bff..dfcd0da9fdbd 100644
--- a/Doc/tools/extensions/suspicious.py
+++ b/Doc/tools/extensions/suspicious.py
@@ -50,6 +50,12 @@
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
More information about the Python-checkins
mailing list