Merge branch 'master' into patch-1

1 files changed, 6 insertions, 4 deletions

diff --git a/sphinx/transforms/post_transforms/code.py b/sphinx/transforms/post_transforms/code.py
index 20df1db3c..52bca8e12 100644
--- a/sphinx/transforms/post_transforms/code.py
+++ b/sphinx/transforms/post_transforms/code.py
@@ -20,9 +20,11 @@ from sphinx.application import Sphinx
 from sphinx.ext import doctest
 from sphinx.transforms import SphinxTransform
 
-HighlightSetting = NamedTuple('HighlightSetting', [('language', str),
-                                                   ('force', bool),
-                                                   ('lineno_threshold', int)])
+
+class HighlightSetting(NamedTuple):
+    language: str
+    force: bool
+    lineno_threshold: int
 
 
 class HighlightLanguageTransform(SphinxTransform):
@@ -47,7 +49,7 @@ class HighlightLanguageTransform(SphinxTransform):
 class HighlightLanguageVisitor(nodes.NodeVisitor):
     def __init__(self, document: nodes.document, default_language: str) -> None:
         self.default_setting = HighlightSetting(default_language, False, sys.maxsize)
-        self.settings = []  # type: List[HighlightSetting]
+        self.settings: List[HighlightSetting] = []
         super().__init__(document)
 
     def unknown_visit(self, node: Node) -> None: