diff --git a/sphinx/domains/c/__init__.py b/sphinx/domains/c/__init__.py index 4ce698b98..b122da164 100644 --- a/sphinx/domains/c/__init__.py +++ b/sphinx/domains/c/__init__.py @@ -15,7 +15,7 @@ from sphinx.domains.c._ast import ( ASTIdentifier, ASTNestedName, ) -from sphinx.domains.c._ids import _macroKeywords, _max_id +from sphinx.domains.c._ids import _macro_keywords, _max_id from sphinx.domains.c._parser import DefinitionParser from sphinx.domains.c._symbol import Symbol, _DuplicateSymbolError from sphinx.locale import _, __ @@ -948,7 +948,7 @@ def setup(app: Sphinx) -> ExtensionMetadata: app.add_domain(CDomain) app.add_config_value('c_id_attributes', [], 'env', types={list, tuple}) app.add_config_value('c_paren_attributes', [], 'env', types={list, tuple}) - app.add_config_value('c_extra_keywords', _macroKeywords, 'env', types={set, list}) + app.add_config_value('c_extra_keywords', _macro_keywords, 'env', types={set, list}) app.add_config_value( 'c_maximum_signature_line_length', None, 'env', types={int, type(None)} ) diff --git a/sphinx/domains/c/_ids.py b/sphinx/domains/c/_ids.py index c05d255c8..dcd1c93b0 100644 --- a/sphinx/domains/c/_ids.py +++ b/sphinx/domains/c/_ids.py @@ -31,7 +31,7 @@ _keywords = [ ] # fmt: skip # These are only keyword'y when the corresponding headers are included. # They are used as default value for c_extra_keywords. -_macroKeywords = [ +_macro_keywords = [ 'alignas', 'alignof', 'bool', diff --git a/sphinx/domains/cpp/_symbol.py b/sphinx/domains/cpp/_symbol.py index cd5bb1707..87505ca67 100644 --- a/sphinx/domains/cpp/_symbol.py +++ b/sphinx/domains/cpp/_symbol.py @@ -163,8 +163,8 @@ class Symbol: # Remember to modify Symbol.remove if modifications to the parent change. self._children: list[Symbol] = [] - self._anonChildren: list[Symbol] = [] - # note: _children includes _anonChildren + self._anon_children: list[Symbol] = [] + # note: _children includes _anon_children if self.parent: self.parent._children.append(self) if self.declaration: diff --git a/sphinx/util/parallel.py b/sphinx/util/parallel.py index 27ea0d591..03debd6ed 100644 --- a/sphinx/util/parallel.py +++ b/sphinx/util/parallel.py @@ -61,7 +61,7 @@ class ParallelTasks: # list of receiving pipe connections of running subprocesses self._precvs: dict[int, Any] = {} # list of receiving pipe connections of waiting subprocesses - self._precvsWaiting: dict[int, Any] = {} + self._precvs_waiting: dict[int, Any] = {} # number of working subprocesses self._pworking = 0 # task number of each subprocess @@ -94,7 +94,7 @@ class ParallelTasks: context: Any = multiprocessing.get_context('fork') proc = context.Process(target=self._process, args=(psend, task_func, arg)) self._procs[tid] = proc - self._precvsWaiting[tid] = precv + self._precvs_waiting[tid] = precv try: self._join_one() except Exception: @@ -135,8 +135,8 @@ class ParallelTasks: joined_any = True break - while self._precvsWaiting and self._pworking < self.nproc: - newtid, newprecv = self._precvsWaiting.popitem() + while self._precvs_waiting and self._pworking < self.nproc: + newtid, newprecv = self._precvs_waiting.popitem() self._precvs[newtid] = newprecv self._procs[newtid].start() self._pworking += 1 diff --git a/tests/test_domains/test_domain_c.py b/tests/test_domains/test_domain_c.py index a96710791..d9f432315 100644 --- a/tests/test_domains/test_domain_c.py +++ b/tests/test_domains/test_domain_c.py @@ -22,7 +22,7 @@ from sphinx.addnodes import ( desc_signature_line, pending_xref, ) -from sphinx.domains.c._ids import _id_prefix, _macroKeywords, _max_id +from sphinx.domains.c._ids import _id_prefix, _macro_keywords, _max_id from sphinx.domains.c._parser import DefinitionParser from sphinx.domains.c._symbol import Symbol from sphinx.ext.intersphinx import load_mappings, validate_intersphinx_mapping @@ -38,7 +38,7 @@ if TYPE_CHECKING: class Config: c_id_attributes = ['id_attr', 'LIGHTGBM_C_EXPORT'] c_paren_attributes = ['paren_attr'] - c_extra_keywords = _macroKeywords + c_extra_keywords = _macro_keywords def parse(name, string):