diff options
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | sphinx/builders/gettext.py | 4 | ||||
| -rw-r--r-- | sphinx/builders/linkcheck.py | 6 | ||||
| -rw-r--r-- | sphinx/domains/c.py | 2 | ||||
| -rw-r--r-- | sphinx/domains/std.py | 2 | ||||
| -rw-r--r-- | sphinx/environment/collectors/toctree.py | 4 | ||||
| -rw-r--r-- | sphinx/ext/autodoc/__init__.py | 2 | ||||
| -rw-r--r-- | sphinx/util/__init__.py | 2 | ||||
| -rw-r--r-- | sphinx/util/i18n.py | 2 | ||||
| -rw-r--r-- | sphinx/util/inspect.py | 2 | ||||
| -rw-r--r-- | sphinx/writers/latex.py | 2 | ||||
| -rw-r--r-- | tests/test_domain_cpp.py | 2 | ||||
| -rw-r--r-- | tests/test_util_fileutil.py | 4 |
13 files changed, 18 insertions, 17 deletions
@@ -40,6 +40,7 @@ extras_require = { ], 'lint': [ 'flake8>=3.5.0', + 'flake8-comprehensions', 'isort', 'mypy>=0.950', 'sphinx-lint', diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py index 92edcc9f2..cfc89146b 100644 --- a/sphinx/builders/gettext.py +++ b/sphinx/builders/gettext.py @@ -60,8 +60,8 @@ class Catalog: def __iter__(self) -> Generator[Message, None, None]: for message in self.messages: - positions = sorted(set((source, line) for source, line, uuid - in self.metadata[message])) + positions = sorted({(source, line) for source, line, uuid + in self.metadata[message]}) uuids = [uuid for source, line, uuid in self.metadata[message]] yield Message(message, positions, uuids) diff --git a/sphinx/builders/linkcheck.py b/sphinx/builders/linkcheck.py index 7755c5f8d..ef8575486 100644 --- a/sphinx/builders/linkcheck.py +++ b/sphinx/builders/linkcheck.py @@ -119,9 +119,9 @@ class CheckExternalLinksBuilder(DummyBuilder): def process_result(self, result: CheckResult) -> None: filename = self.env.doc2path(result.docname, None) - linkstat = dict(filename=filename, lineno=result.lineno, - status=result.status, code=result.code, uri=result.uri, - info=result.message) + linkstat = {"filename": filename, "lineno": result.lineno, + "status": result.status, "code": result.code, "uri": result.uri, + "info": result.message} self.write_linkstat(linkstat) if result.status == 'unchecked': diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py index 75581d71a..3f7d4bf4b 100644 --- a/sphinx/domains/c.py +++ b/sphinx/domains/c.py @@ -3610,7 +3610,7 @@ class AliasTransform(SphinxTransform): nodes = self._render_symbol(s, maxdepth=node.aliasOptions['maxdepth'], skipThis=node.aliasOptions['noroot'], aliasOptions=node.aliasOptions, - renderOptions=dict(), document=node.document) + renderOptions={}, document=node.document) node.replace_self(nodes) diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py index 96ac8ab80..d985e5d3a 100644 --- a/sphinx/domains/std.py +++ b/sphinx/domains/std.py @@ -1058,7 +1058,7 @@ class StandardDomain(Domain): figtype: str, docname: str, target_node: Element) -> Tuple[int, ...]: if figtype == 'section': if builder.name == 'latex': - return tuple() + return () elif docname not in env.toc_secnumbers: raise ValueError # no number assigned else: diff --git a/sphinx/environment/collectors/toctree.py b/sphinx/environment/collectors/toctree.py index 75c981f3c..507c83e97 100644 --- a/sphinx/environment/collectors/toctree.py +++ b/sphinx/environment/collectors/toctree.py @@ -227,7 +227,7 @@ class TocTreeCollector(EnvironmentCollector): else: secnum = secnumbers.get('') - return secnum or tuple() + return secnum or () def get_next_fignumber(figtype: str, secnum: Tuple[int, ...]) -> Tuple[int, ...]: counter = fignum_counter.setdefault(figtype, {}) @@ -273,7 +273,7 @@ class TocTreeCollector(EnvironmentCollector): _walk_doctree(docname, doctree, secnum) if env.config.numfig: - _walk_doc(env.config.root_doc, tuple()) + _walk_doc(env.config.root_doc, ()) for docname, fignums in env.toc_fignumbers.items(): if fignums != old_fignumbers.get(docname): rewrite_needed.append(docname) diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py index 642e0cfd8..78623a92f 100644 --- a/sphinx/ext/autodoc/__init__.py +++ b/sphinx/ext/autodoc/__init__.py @@ -105,7 +105,7 @@ def inherited_members_option(arg: Any) -> Set[str]: if arg in (None, True): return {'object'} elif arg: - return set(x.strip() for x in arg.split(',')) + return {x.strip() for x in arg.split(',')} else: return set() diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py index c8e8c6b94..c80857a83 100644 --- a/sphinx/util/__init__.py +++ b/sphinx/util/__init__.py @@ -305,7 +305,7 @@ def parselinenos(spec: str, total: int) -> List[int]: """Parse a line number spec (such as "1,2,4-6") and return a list of wanted line numbers. """ - items = list() + items = [] parts = spec.split(',') for part in parts: try: diff --git a/sphinx/util/i18n.py b/sphinx/util/i18n.py index 105fe9628..0de6b6a4e 100644 --- a/sphinx/util/i18n.py +++ b/sphinx/util/i18n.py @@ -231,7 +231,7 @@ def format_date(format: str, date: datetime = None, language: str = None) -> str def get_image_filename_for_language(filename: str, env: "BuildEnvironment") -> str: filename_format = env.config.figure_language_filename - d = dict() + d = {} d['root'], d['ext'] = path.splitext(filename) dirname = path.dirname(d['root']) if dirname and not dirname.endswith(path.sep): diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py index 2321a95dc..0028e7500 100644 --- a/sphinx/util/inspect.py +++ b/sphinx/util/inspect.py @@ -106,7 +106,7 @@ def getmro(obj: Any) -> Tuple[Type, ...]: if isinstance(__mro__, tuple): return __mro__ else: - return tuple() + return () def getorigbases(obj: Any) -> Optional[Tuple[Any, ...]]: diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index f275100e9..ffadb67aa 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -866,7 +866,7 @@ class LaTeXTranslator(SphinxTranslator): labels = self.hypertarget_to(node) table_type = self.table.get_table_type() table = self.render(table_type + '.tex_t', - dict(table=self.table, labels=labels)) + {'table': self.table, 'labels': labels}) self.body.append(BLANKLINE) self.body.append(table) self.body.append(CR) diff --git a/tests/test_domain_cpp.py b/tests/test_domain_cpp.py index 765f9fd65..4cf757c4c 100644 --- a/tests/test_domain_cpp.py +++ b/tests/test_domain_cpp.py @@ -1240,7 +1240,7 @@ not found in `{test}` def __init__(self, role, root, contents): self.name = role self.classes = classes(role, root) - self.content_classes = dict() + self.content_classes = {} for tag in contents: self.content_classes[tag] = classes(role, tag) diff --git a/tests/test_util_fileutil.py b/tests/test_util_fileutil.py index 8ae3f918f..7ea12508c 100644 --- a/tests/test_util_fileutil.py +++ b/tests/test_util_fileutil.py @@ -80,7 +80,7 @@ def test_copy_asset(tempdir): # copy directories destdir = tempdir / 'test2' - copy_asset(source, destdir, context=dict(var1='bar', var2='baz'), renderer=renderer) + copy_asset(source, destdir, context={'var1': 'bar', 'var2': 'baz'}, renderer=renderer) assert (destdir / 'index.rst').exists() assert (destdir / 'foo.rst').exists() assert (destdir / 'foo.rst').read_text(encoding='utf8') == 'bar.rst' @@ -95,7 +95,7 @@ def test_copy_asset(tempdir): destdir = tempdir / 'test3' copy_asset(source, destdir, excluded, - context=dict(var1='bar', var2='baz'), renderer=renderer) + context={'var1': 'bar', 'var2': 'baz'}, renderer=renderer) assert (destdir / 'index.rst').exists() assert (destdir / 'foo.rst').exists() assert not (destdir / '_static' / 'basic.css').exists() |