Merge branch '3.x'

3 files changed, 3 insertions, 5 deletions

diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index 8bc1ba6c1..9ece164b1 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -15,7 +15,7 @@ from importlib import import_module
 from inspect import Signature
 from io import StringIO
 from os import path
-from typing import Any, Dict, IO, List, Tuple, Optional
+from typing import IO, Any, Dict, List, Optional, Tuple
 from zipfile import ZipFile
 
 from sphinx.errors import PycodeError
diff --git a/sphinx/pycode/ast.py b/sphinx/pycode/ast.py
index e5b84600b..bad0d39dc 100644
--- a/sphinx/pycode/ast.py
+++ b/sphinx/pycode/ast.py
@@ -9,8 +9,7 @@
 """
 
 import sys
-from typing import Dict, List, Type, Optional
-from typing import overload
+from typing import Dict, List, Optional, Type, overload
 
 if sys.version_info > (3, 8):
     import ast
diff --git a/sphinx/pycode/parser.py b/sphinx/pycode/parser.py
index 2d454cc96..97d7e6de5 100644
--- a/sphinx/pycode/parser.py
+++ b/sphinx/pycode/parser.py
@@ -13,14 +13,13 @@ import re
 import tokenize
 from collections import OrderedDict
 from inspect import Signature
-from token import NAME, NEWLINE, INDENT, DEDENT, NUMBER, OP, STRING
+from token import DEDENT, INDENT, NAME, NEWLINE, NUMBER, OP, STRING
 from tokenize import COMMENT, NL
 from typing import Any, Dict, List, Optional, Tuple
 
 from sphinx.pycode.ast import ast  # for py37 or older
 from sphinx.pycode.ast import parse, unparse
 
-
 comment_re = re.compile('^\\s*#: ?(.*)\r?\n?$')
 indent_re = re.compile('^\\s*$')
 emptyline_re = re.compile('^\\s*(#.*)?$')