Skip to content

Commit b365cfa

Browse files
miss-islingtonasottile
authored andcommitted
bpo-36853: Fix suspicious.py to actually print the unused rules (GH-13579) (GH-15649)
* Fix suspicious.py to actually print the unused rules * Fix the other `self.warn` calls (cherry picked from commit e1786b5) Co-authored-by: Anthony Sottile <[email protected]>
1 parent bf69e16 commit b365cfa

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

Doc/tools/extensions/suspicious.py

+14-11
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,12 @@ def write_doc(self, docname, doctree):
115115
def finish(self):
116116
unused_rules = [rule for rule in self.rules if not rule.used]
117117
if unused_rules:
118-
self.logger.warn('Found %s/%s unused rules:' %
119-
(len(unused_rules), len(self.rules)))
120-
for rule in unused_rules:
121-
self.logger.info(repr(rule))
118+
self.logger.warning(
119+
'Found %s/%s unused rules: %s' % (
120+
len(unused_rules), len(self.rules),
121+
''.join(repr(rule) for rule in unused_rules),
122+
)
123+
)
122124
return
123125

124126
def check_issue(self, line, lineno, issue):
@@ -151,14 +153,15 @@ def report_issue(self, text, lineno, issue):
151153
self.any_issue = True
152154
self.write_log_entry(lineno, issue, text)
153155
if py3:
154-
self.logger.warn('[%s:%d] "%s" found in "%-.120s"' %
155-
(self.docname, lineno, issue, text))
156+
self.logger.warning('[%s:%d] "%s" found in "%-.120s"' %
157+
(self.docname, lineno, issue, text))
156158
else:
157-
self.logger.warn('[%s:%d] "%s" found in "%-.120s"' % (
158-
self.docname.encode(sys.getdefaultencoding(),'replace'),
159-
lineno,
160-
issue.encode(sys.getdefaultencoding(),'replace'),
161-
text.strip().encode(sys.getdefaultencoding(),'replace')))
159+
self.logger.warning(
160+
'[%s:%d] "%s" found in "%-.120s"' % (
161+
self.docname.encode(sys.getdefaultencoding(),'replace'),
162+
lineno,
163+
issue.encode(sys.getdefaultencoding(),'replace'),
164+
text.strip().encode(sys.getdefaultencoding(),'replace')))
162165
self.app.statuscode = 1
163166

164167
def write_log_entry(self, lineno, issue, text):

0 commit comments

Comments
 (0)