diff options
34 files changed, 24 insertions, 57 deletions
diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 574ede346..bb84d0d17 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -19,7 +19,6 @@ from subprocess import PIPE from .deprecation import RemovedInNextVersionWarning - # by default, all DeprecationWarning under sphinx package will be emit. # Users can avoid this by using environment variable: PYTHONWARNINGS= if 'PYTHONWARNINGS' not in os.environ: diff --git a/sphinx/addnodes.py b/sphinx/addnodes.py index 5b3dc08c5..0ad07aa5f 100644 --- a/sphinx/addnodes.py +++ b/sphinx/addnodes.py @@ -8,8 +8,7 @@ :license: BSD, see LICENSE for details. """ -from typing import Any, Dict, List, Sequence -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, List, Sequence from docutils import nodes from docutils.nodes import Element diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py index f161dcf71..2e7add5db 100644 --- a/sphinx/builders/__init__.py +++ b/sphinx/builders/__init__.py @@ -11,8 +11,7 @@ import pickle import time from os import path -from typing import Any, Dict, Iterable, List, Sequence, Set, Tuple, Type, Union -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Sequence, Set, Tuple, Type, Union from docutils import nodes from docutils.nodes import Node diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py index a5ba822db..439c8512d 100644 --- a/sphinx/builders/gettext.py +++ b/sphinx/builders/gettext.py @@ -13,7 +13,7 @@ from collections import OrderedDict, defaultdict from datetime import datetime, timedelta, tzinfo from os import getenv, path, walk from time import time -from typing import Any, DefaultDict, Dict, Iterable, Generator, List, Set, Tuple, Union +from typing import Any, DefaultDict, Dict, Generator, Iterable, List, Set, Tuple, Union from uuid import uuid4 from docutils import nodes diff --git a/sphinx/builders/html/__init__.py b/sphinx/builders/html/__init__.py index bea13045f..0af5dde28 100644 --- a/sphinx/builders/html/__init__.py +++ b/sphinx/builders/html/__init__.py @@ -47,7 +47,6 @@ from sphinx.util.osutil import copyfile, ensuredir, movefile, os_path, relative_ from sphinx.util.tags import Tags from sphinx.writers.html import HTMLTranslator, HTMLWriter - # HTML5 Writer is available or not if is_html5_writer_available(): from sphinx.writers.html5 import HTML5Translator diff --git a/sphinx/builders/xml.py b/sphinx/builders/xml.py index 65d29b3ca..e6964f338 100644 --- a/sphinx/builders/xml.py +++ b/sphinx/builders/xml.py @@ -23,7 +23,6 @@ from sphinx.util import logging from sphinx.util.osutil import ensuredir, os_path from sphinx.writers.xml import PseudoXMLWriter, XMLWriter - logger = logging.getLogger(__name__) diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py index 275ca1b2d..116cc6c41 100644 --- a/sphinx/directives/code.py +++ b/sphinx/directives/code.py @@ -8,8 +8,7 @@ import sys from difflib import unified_diff -from typing import Any, Dict, List, Tuple -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, List, Tuple from docutils import nodes from docutils.nodes import Element, Node diff --git a/sphinx/domains/index.py b/sphinx/domains/index.py index 16963f2d1..840b417c2 100644 --- a/sphinx/domains/index.py +++ b/sphinx/domains/index.py @@ -8,8 +8,7 @@ :license: BSD, see LICENSE for details. """ -from typing import Any, Dict, Iterable, List, Tuple -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Tuple from docutils import nodes from docutils.nodes import Node, system_message diff --git a/sphinx/domains/math.py b/sphinx/domains/math.py index 5b6062ecb..30ba5b66d 100644 --- a/sphinx/domains/math.py +++ b/sphinx/domains/math.py @@ -8,8 +8,7 @@ :license: BSD, see LICENSE for details. """ -from typing import Any, Dict, Iterable, List, Tuple -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Tuple from docutils import nodes from docutils.nodes import Element, Node, make_id, system_message diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py index 0fc5e9961..d71a4891d 100644 --- a/sphinx/domains/python.py +++ b/sphinx/domains/python.py @@ -40,7 +40,6 @@ from sphinx.util.inspect import signature_from_str from sphinx.util.nodes import make_id, make_refnode from sphinx.util.typing import TextlikeNode - logger = logging.getLogger(__name__) diff --git a/sphinx/environment/collectors/__init__.py b/sphinx/environment/collectors/__init__.py index 2dd33c767..20035db71 100644 --- a/sphinx/environment/collectors/__init__.py +++ b/sphinx/environment/collectors/__init__.py @@ -8,8 +8,7 @@ :license: BSD, see LICENSE for details. """ -from typing import Dict, List, Set -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Dict, List, Set from docutils import nodes diff --git a/sphinx/environment/collectors/toctree.py b/sphinx/environment/collectors/toctree.py index 995685d75..13ab2498c 100644 --- a/sphinx/environment/collectors/toctree.py +++ b/sphinx/environment/collectors/toctree.py @@ -22,7 +22,6 @@ from sphinx.locale import __ from sphinx.transforms import SphinxContentsFilter from sphinx.util import logging, url_re - N = TypeVar('N') logger = logging.getLogger(__name__) diff --git a/sphinx/events.py b/sphinx/events.py index 59d38daf0..1ffb11561 100644 --- a/sphinx/events.py +++ b/sphinx/events.py @@ -12,8 +12,7 @@ from collections import defaultdict from operator import attrgetter -from typing import Any, Callable, Dict, List, NamedTuple, Tuple, Type -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Callable, Dict, List, NamedTuple, Tuple, Type from sphinx.errors import ExtensionError, SphinxError from sphinx.locale import __ diff --git a/sphinx/ext/autodoc/directive.py b/sphinx/ext/autodoc/directive.py index 5543059cb..604a9d51d 100644 --- a/sphinx/ext/autodoc/directive.py +++ b/sphinx/ext/autodoc/directive.py @@ -21,7 +21,6 @@ from sphinx.util import logging from sphinx.util.docutils import SphinxDirective, switch_source_input from sphinx.util.nodes import nested_parse_with_titles - logger = logging.getLogger(__name__) diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py index 4983496d5..fce5439b2 100644 --- a/sphinx/ext/autosummary/__init__.py +++ b/sphinx/ext/autosummary/__init__.py @@ -87,7 +87,6 @@ from sphinx.util.docutils import (NullReporter, SphinxDirective, SphinxRole, new from sphinx.util.matching import Matcher from sphinx.writers.html import HTMLTranslator - logger = logging.getLogger(__name__) diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py index 1769b837e..a098177a4 100644 --- a/sphinx/ext/autosummary/generate.py +++ b/sphinx/ext/autosummary/generate.py @@ -49,7 +49,6 @@ from sphinx.util.inspect import safe_getattr from sphinx.util.osutil import ensuredir from sphinx.util.template import SphinxTemplateLoader - logger = logging.getLogger(__name__) diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py index 2a8226196..76da36bbe 100644 --- a/sphinx/ext/doctest.py +++ b/sphinx/ext/doctest.py @@ -15,8 +15,8 @@ import sys import time from io import StringIO from os import path -from typing import Any, Callable, Dict, Iterable, List, Sequence, Set, Tuple, Type -from typing import TYPE_CHECKING +from typing import (TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Sequence, Set, Tuple, + Type) from docutils import nodes from docutils.nodes import Element, Node, TextElement diff --git a/sphinx/ext/napoleon/docstring.py b/sphinx/ext/napoleon/docstring.py index ca50635a9..dd1a50ea9 100644 --- a/sphinx/ext/napoleon/docstring.py +++ b/sphinx/ext/napoleon/docstring.py @@ -22,7 +22,6 @@ from sphinx.ext.napoleon.iterators import modify_iter from sphinx.locale import _, __ from sphinx.util import logging - logger = logging.getLogger(__name__) _directive_regex = re.compile(r'\.\. \S+::') diff --git a/sphinx/extension.py b/sphinx/extension.py index 98efc48fe..695484232 100644 --- a/sphinx/extension.py +++ b/sphinx/extension.py @@ -8,8 +8,7 @@ :license: BSD, see LICENSE for details. """ -from typing import Any, Dict -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict from sphinx.config import Config from sphinx.errors import VersionRequirementError diff --git a/sphinx/io.py b/sphinx/io.py index 6255dbc66..df5aff58d 100644 --- a/sphinx/io.py +++ b/sphinx/io.py @@ -8,8 +8,7 @@ :license: BSD, see LICENSE for details. """ import codecs -from typing import Any, List, Type -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, List, Type from docutils import nodes from docutils.core import Publisher diff --git a/sphinx/jinja2glue.py b/sphinx/jinja2glue.py index ab9a7d799..3b0dfba90 100644 --- a/sphinx/jinja2glue.py +++ b/sphinx/jinja2glue.py @@ -10,8 +10,7 @@ from os import path from pprint import pformat -from typing import Any, Callable, Dict, Iterator, List, Tuple, Union -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Callable, Dict, Iterator, List, Tuple, Union from jinja2 import BaseLoader, FileSystemLoader, TemplateNotFound, contextfunction from jinja2.environment import Environment diff --git a/sphinx/parsers.py b/sphinx/parsers.py index fc400e5c7..47debcf49 100644 --- a/sphinx/parsers.py +++ b/sphinx/parsers.py @@ -9,8 +9,7 @@ """ import warnings -from typing import Any, Dict, List, Type, Union -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, List, Type, Union import docutils.parsers import docutils.parsers.rst diff --git a/sphinx/registry.py b/sphinx/registry.py index 541fef1b3..56b459589 100644 --- a/sphinx/registry.py +++ b/sphinx/registry.py @@ -11,8 +11,7 @@ import traceback from importlib import import_module from types import MethodType -from typing import Any, Callable, Dict, Iterator, List, Tuple, Type, Union -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Callable, Dict, Iterator, List, Tuple, Type, Union from docutils import nodes from docutils.io import Input diff --git a/sphinx/roles.py b/sphinx/roles.py index 426a62e90..2fe27a5a8 100644 --- a/sphinx/roles.py +++ b/sphinx/roles.py @@ -9,8 +9,7 @@ """ import re -from typing import Any, Dict, List, Tuple, Type -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, List, Tuple, Type from docutils import nodes, utils from docutils.nodes import Element, Node, TextElement, system_message diff --git a/sphinx/theming.py b/sphinx/theming.py index c05d87407..0ac3613cc 100644 --- a/sphinx/theming.py +++ b/sphinx/theming.py @@ -13,8 +13,7 @@ import os import shutil import tempfile from os import path -from typing import Any, Dict, List -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, List from zipfile import ZipFile import pkg_resources diff --git a/sphinx/transforms/__init__.py b/sphinx/transforms/__init__.py index 1dbdb94f7..ebc332da1 100644 --- a/sphinx/transforms/__init__.py +++ b/sphinx/transforms/__init__.py @@ -9,8 +9,7 @@ """ import re -from typing import Any, Dict, Generator, List, Tuple -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, Generator, List, Tuple from docutils import nodes from docutils.nodes import Element, Node, Text diff --git a/sphinx/transforms/i18n.py b/sphinx/transforms/i18n.py index 8dc72f8da..96b35ac60 100644 --- a/sphinx/transforms/i18n.py +++ b/sphinx/transforms/i18n.py @@ -10,8 +10,7 @@ from os import path from textwrap import indent -from typing import Any, Dict, List, Tuple, Type, TypeVar -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, List, Tuple, Type, TypeVar from docutils import nodes from docutils.io import StringInput diff --git a/sphinx/transforms/references.py b/sphinx/transforms/references.py index 372d06470..e5ff91ee6 100644 --- a/sphinx/transforms/references.py +++ b/sphinx/transforms/references.py @@ -8,8 +8,7 @@ :license: BSD, see LICENSE for details. """ -from typing import Any, Dict -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict from docutils.transforms.references import DanglingReferences diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py index 392fcdf5c..1e7536541 100644 --- a/sphinx/util/__init__.py +++ b/sphinx/util/__init__.py @@ -26,7 +26,6 @@ from typing import (IO, TYPE_CHECKING, Any, Callable, Dict, Iterable, Iterator, Set, Tuple, Type) from urllib.parse import parse_qsl, quote_plus, urlencode, urlsplit, urlunsplit - from sphinx.deprecation import RemovedInSphinx50Warning from sphinx.errors import ExtensionError, FiletypeNotFoundError, SphinxParallelError from sphinx.locale import __ @@ -42,7 +41,6 @@ from sphinx.util.osutil import (SEP, copyfile, copytimes, ensuredir, make_filena movefile, mtimes_of_files, os_path, relative_uri) from sphinx.util.typing import PathMatcher - if TYPE_CHECKING: from sphinx.application import Sphinx diff --git a/sphinx/util/compat.py b/sphinx/util/compat.py index 6893efaf9..26de3c8f2 100644 --- a/sphinx/util/compat.py +++ b/sphinx/util/compat.py @@ -9,8 +9,7 @@ """ import sys -from typing import Any, Dict -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict if TYPE_CHECKING: from sphinx.application import Sphinx diff --git a/sphinx/util/fileutil.py b/sphinx/util/fileutil.py index 2f878a578..8801eb913 100644 --- a/sphinx/util/fileutil.py +++ b/sphinx/util/fileutil.py @@ -10,8 +10,7 @@ import os import posixpath -from typing import Callable, Dict -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Callable, Dict from docutils.utils import relative_path diff --git a/sphinx/util/i18n.py b/sphinx/util/i18n.py index e5d4f112e..2930007cb 100644 --- a/sphinx/util/i18n.py +++ b/sphinx/util/i18n.py @@ -12,8 +12,7 @@ import os import re from datetime import datetime, timezone from os import path -from typing import Callable, Generator, List, NamedTuple, Tuple, Union -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Callable, Generator, List, NamedTuple, Tuple, Union import babel.dates from babel.messages.mofile import write_mo diff --git a/sphinx/util/pycompat.py b/sphinx/util/pycompat.py index 0c0ac12d6..b6eb32f69 100644 --- a/sphinx/util/pycompat.py +++ b/sphinx/util/pycompat.py @@ -13,7 +13,6 @@ from typing import Any, Callable from sphinx.deprecation import RemovedInSphinx60Warning - # ------------------------------------------------------------------------------ # Python 2/3 compatibility diff --git a/sphinx/versioning.py b/sphinx/versioning.py index 4f925741c..02f31801a 100644 --- a/sphinx/versioning.py +++ b/sphinx/versioning.py @@ -12,8 +12,7 @@ import pickle from itertools import product, zip_longest from operator import itemgetter from os import path -from typing import Any, Dict, Iterator -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, Iterator from uuid import uuid4 from docutils.nodes import Node |