From 671f348a276892056373a87e776abb6a110adf96 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:11:08 +0100 Subject: [PATCH] fixup! Remove calls to ``builtins.print()`` --- pyproject.toml | 2 -- sphinx/domains/c.py | 16 ++++++++-------- sphinx/domains/cpp.py | 18 +++++++++--------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 183011954..d6568be0b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -271,8 +271,6 @@ ignore = [ "SIM108", # use ternary operator # flake8-self "SLF001", # private member accessed - # flake8-print - "T201", # print found # flake8-todo "TD001", # invalid TODO tag "TD002", # missing author in TODO diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py index 5032ae3a0..9444c6b0d 100644 --- a/sphinx/domains/c.py +++ b/sphinx/domains/c.py @@ -3587,8 +3587,8 @@ class AliasTransform(SphinxTransform): rootSymbol: Symbol = self.env.domains['c'].data['root_symbol'] parentSymbol: Symbol = rootSymbol.direct_lookup(parentKey) if not parentSymbol: - logger.debug("Target: ", sig) - logger.debug("ParentKey: ", parentKey) + logger.debug("Target: %s", sig) + logger.debug("ParentKey: %s", parentKey) logger.debug(rootSymbol.dump(1)) assert parentSymbol # should be there @@ -3778,7 +3778,7 @@ class CDomain(Domain): def clear_doc(self, docname: str) -> None: if Symbol.debug_show_tree: - logger.debug("clear_doc:", docname) + logger.debug("clear_doc: %s", docname) logger.debug("\tbefore:") logger.debug(self.data['root_symbol'].dump(1)) logger.debug("\tbefore end") @@ -3790,14 +3790,14 @@ class CDomain(Domain): logger.debug("\tafter:") logger.debug(self.data['root_symbol'].dump(1)) logger.debug("\tafter end") - logger.debug("clear_doc end:", docname) + logger.debug("clear_doc end: %s", docname) def process_doc(self, env: BuildEnvironment, docname: str, document: nodes.document) -> None: if Symbol.debug_show_tree: - logger.debug("process_doc:", docname) + logger.debug("process_doc: %s", docname) logger.debug(self.data['root_symbol'].dump(0)) - logger.debug("process_doc end:", docname) + logger.debug("process_doc end: %s", docname) def process_field_xref(self, pnode: pending_xref) -> None: pnode.attributes.update(self.env.ref_context) @@ -3837,8 +3837,8 @@ class CDomain(Domain): if parentKey: parentSymbol: Symbol = rootSymbol.direct_lookup(parentKey) if not parentSymbol: - logger.debug("Target: ", target) - logger.debug("ParentKey: ", parentKey) + logger.debug("Target: %s", target) + logger.debug("ParentKey: %s", parentKey) logger.debug(rootSymbol.dump(1)) assert parentSymbol # should be there else: diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index ca557c09e..80920c677 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -7717,8 +7717,8 @@ class AliasTransform(SphinxTransform): rootSymbol: Symbol = self.env.domains['cpp'].data['root_symbol'] parentSymbol: Symbol = rootSymbol.direct_lookup(parentKey) if not parentSymbol: - logger.debug("Target: ", sig) - logger.debug("ParentKey: ", parentKey) + logger.debug("Target: %s", sig) + logger.debug("ParentKey: %s", parentKey) logger.debug(rootSymbol.dump(1)) assert parentSymbol # should be there @@ -7960,7 +7960,7 @@ class CPPDomain(Domain): def clear_doc(self, docname: str) -> None: if Symbol.debug_show_tree: - logger.debug("clear_doc:", docname) + logger.debug("clear_doc: %s", docname) logger.debug("\tbefore:") logger.debug(self.data['root_symbol'].dump(1)) logger.debug("\tbefore end") @@ -7972,7 +7972,7 @@ class CPPDomain(Domain): logger.debug("\tafter:") logger.debug(self.data['root_symbol'].dump(1)) logger.debug("\tafter end") - logger.debug("clear_doc end:", docname) + logger.debug("clear_doc end: %s", docname) for name, nDocname in list(self.data['names'].items()): if nDocname == docname: del self.data['names'][name] @@ -7980,9 +7980,9 @@ class CPPDomain(Domain): def process_doc(self, env: BuildEnvironment, docname: str, document: nodes.document) -> None: if Symbol.debug_show_tree: - logger.debug("process_doc:", docname) + logger.debug("process_doc: %s", docname) logger.debug(self.data['root_symbol'].dump(0)) - logger.debug("process_doc end:", docname) + logger.debug("process_doc end: %s", docname) def process_field_xref(self, pnode: pending_xref) -> None: pnode.attributes.update(self.env.ref_context) @@ -8044,8 +8044,8 @@ class CPPDomain(Domain): if parentKey: parentSymbol: Symbol = rootSymbol.direct_lookup(parentKey) if not parentSymbol: - logger.debug("Target: ", target) - logger.debug("ParentKey: ", parentKey.data) + logger.debug("Target: %s", target) + logger.debug("ParentKey: %s", parentKey.data) logger.debug(rootSymbol.dump(1)) assert parentSymbol # should be there else: @@ -8099,7 +8099,7 @@ class CPPDomain(Domain): objtypes = self.objtypes_for_role(typ) if objtypes: return declTyp in objtypes - logger.debug(f"Type is {typ}, declaration type is {declTyp}") + logger.debug(f"Type is {typ}, declaration type is {declTyp}") # NoQA: G004 raise AssertionError if not checkType(): logger.warning("cpp:%s targets a %s (%s).",