Use the flake8-comprehensions lint plugin (#10601)

setup.py

@@ -40,6 +40,7 @@ extras_require = {
     ],
     'lint': [
         'flake8>=3.5.0',
+        'flake8-comprehensions',
         'isort',
         'mypy>=0.950',
         'sphinx-lint',

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)
 

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':

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)
 
 

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:

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)

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()
 

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:

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):

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, ...]]:

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)

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)
 

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()