traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop using deprecated logging API in Sphinx suspicious checker (GH-9875)

This commit is contained in:
Pablo Galindo 2018-10-15 20:07:23 +01:00 committed by GitHub
parent 6bdb6f7675
commit ee171a26c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Doc/tools/extensions/suspicious.py
View File

@ -48,6 +48,7 @@ import sys
from docutils import nodes from docutils import nodes
from sphinx.builders import Builder from sphinx.builders import Builder
import sphinx.util
detect_all = re.compile(r''' detect_all = re.compile(r'''
::(?=[^=])| # two :: (but NOT ::=) ::(?=[^=])| # two :: (but NOT ::=)
@ -85,6 +86,7 @@ class CheckSuspiciousMarkupBuilder(Builder):
Checks for possibly invalid markup that may leak into the output. Checks for possibly invalid markup that may leak into the output.
""" """
name = 'suspicious' name = 'suspicious'
logger = sphinx.util.logging.getLogger("CheckSuspiciousMarkupBuilder")
def init(self): def init(self):
# create output file # create output file
@ -116,7 +118,7 @@ class CheckSuspiciousMarkupBuilder(Builder):
self.warn('Found %s/%s unused rules:' % self.warn('Found %s/%s unused rules:' %
(len(unused_rules), len(self.rules))) (len(unused_rules), len(self.rules)))
for rule in unused_rules: for rule in unused_rules:
self.info(repr(rule)) self.logger.info(repr(rule))
return return
def check_issue(self, line, lineno, issue): def check_issue(self, line, lineno, issue):
@ -146,7 +148,7 @@ class CheckSuspiciousMarkupBuilder(Builder):
return False return False
def report_issue(self, text, lineno, issue): def report_issue(self, text, lineno, issue):
if not self.any_issue: self.info() if not self.any_issue: self.logger.info()
self.any_issue = True self.any_issue = True
self.write_log_entry(lineno, issue, text) self.write_log_entry(lineno, issue, text)
if py3: if py3:
@ -181,7 +183,7 @@ class CheckSuspiciousMarkupBuilder(Builder):
A csv file, with exactly the same format as suspicious.csv A csv file, with exactly the same format as suspicious.csv
Fields: document name (normalized), line number, issue, surrounding text Fields: document name (normalized), line number, issue, surrounding text
""" """
self.info("loading ignore rules... ", nonl=1) self.logger.info("loading ignore rules... ", nonl=1)
self.rules = rules = [] self.rules = rules = []
try: try:
if py3: if py3:
@ -206,7 +208,7 @@ class CheckSuspiciousMarkupBuilder(Builder):
rule = Rule(docname, lineno, issue, text) rule = Rule(docname, lineno, issue, text)
rules.append(rule) rules.append(rule)
f.close() f.close()
self.info('done, %d rules loaded' % len(self.rules)) self.logger.info('done, %d rules loaded' % len(self.rules))
def get_lineno(node): def get_lineno(node):