diff options
| author | François Freitag <mail@franek.fr> | 2020-11-11 14:00:27 +0300 |
|---|---|---|
| committer | François Freitag <mail@franek.fr> | 2020-11-11 15:19:05 +0300 |
| commit | 0949735210abaa05b6448e531984f159403053f4 (patch) | |
| tree | 3561f378bc9fa97a73ad5b298e4bcd669827a044 /sphinx/testing | |
| parent | e2c969c4955662a8c5e4da8b77672aaaa7729359 (diff) | |
Sort imports with isort
Keep imports alphabetically sorted and their order homogeneous across
Python source files.
The isort project has more feature and is more active than the
flake8-import-order plugin.
Most issues caught were simply import ordering from the same module.
Where imports were purposefully placed out of order, tag with
isort:skip.
Diffstat (limited to 'sphinx/testing')
| -rw-r--r-- | sphinx/testing/fixtures.py | 1 | ||||
| -rw-r--r-- | sphinx/testing/path.py | 3 | ||||
| -rw-r--r-- | sphinx/testing/util.py | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py index f457e3745..e6c3edd18 100644 --- a/sphinx/testing/fixtures.py +++ b/sphinx/testing/fixtures.py @@ -21,7 +21,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 c0dd1feac..208974115 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 @@ -26,7 +26,6 @@ from sphinx.pycode import ModuleAnalyzer from sphinx.testing.path import path from sphinx.util.osutil import relpath - __all__ = [ 'Struct', 'SphinxTestApp', 'SphinxTestAppWrapperForSkipBuilding', |