Merge branch '3.x'

3 files changed, 2 insertions, 5 deletions

diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py
index 55e639df6..1008ea1b8 100644
--- a/sphinx/testing/fixtures.py
+++ b/sphinx/testing/fixtures.py
@@ -20,7 +20,6 @@ import pytest
 from sphinx.testing import util
 from sphinx.testing.util import SphinxTestApp, SphinxTestAppWrapperForSkipBuilding
 
-
 DEFAULT_ENABLED_MARKERS = [
     (
         'sphinx(builder, testroot=None, freshenv=False, confoverrides=None, tags=None,'
diff --git a/sphinx/testing/path.py b/sphinx/testing/path.py
index 4c3702e3d..a37839d60 100644
--- a/sphinx/testing/path.py
+++ b/sphinx/testing/path.py
@@ -11,11 +11,10 @@ import os
 import shutil
 import sys
 import warnings
-from typing import Any, Callable, IO, List
+from typing import IO, Any, Callable, List
 
 from sphinx.deprecation import RemovedInSphinx50Warning
 
-
 FILESYSTEMENCODING = sys.getfilesystemencoding() or sys.getdefaultencoding()
 
 
diff --git a/sphinx/testing/util.py b/sphinx/testing/util.py
index db1ae22b6..183adc32b 100644
--- a/sphinx/testing/util.py
+++ b/sphinx/testing/util.py
@@ -13,7 +13,7 @@ import re
 import sys
 import warnings
 from io import StringIO
-from typing import Any, Dict, Generator, IO, List, Pattern
+from typing import IO, Any, Dict, Generator, List, Pattern
 from xml.etree import ElementTree
 
 from docutils import nodes
@@ -25,7 +25,6 @@ from sphinx.pycode import ModuleAnalyzer
 from sphinx.testing.path import path
 from sphinx.util.osutil import relpath
 
-
 __all__ = [
     'Struct', 'SphinxTestApp', 'SphinxTestAppWrapperForSkipBuilding',
 ]