diff --git a/sphinx/application.py b/sphinx/application.py index 65b6c4eb2..ba4b6996f 100644 --- a/sphinx/application.py +++ b/sphinx/application.py @@ -30,6 +30,7 @@ import sphinx from sphinx import package_dir, locale from sphinx.config import Config from sphinx.deprecation import RemovedInSphinx40Warning +from sphinx.domains import Domain, Index from sphinx.environment import BuildEnvironment from sphinx.environment.collectors import EnvironmentCollector from sphinx.errors import ApplicationError, ConfigError, VersionRequirementError diff --git a/sphinx/io.py b/sphinx/io.py index a5a715716..8f8eada4d 100644 --- a/sphinx/io.py +++ b/sphinx/io.py @@ -9,7 +9,7 @@ """ import codecs import warnings -from typing import Any, List, Tuple +from typing import Any, List from typing import Type # for python3.5.1 from docutils import nodes @@ -19,7 +19,6 @@ from docutils.io import FileInput, Input, NullOutput from docutils.parsers import Parser from docutils.parsers.rst import Parser as RSTParser from docutils.readers import standalone -from docutils.statemachine import StringList, string2lines from docutils.transforms import Transform from docutils.transforms.references import DanglingReferences from docutils.writers import UnfilteredWriter @@ -179,7 +178,6 @@ class SphinxFileInput(FileInput): super().__init__(*args, **kwargs) - def read_doc(app: "Sphinx", env: BuildEnvironment, filename: str) -> nodes.document: """Parse a document and convert to doctree.""" # set up error_handler for the target document diff --git a/sphinx/locale/__init__.py b/sphinx/locale/__init__.py index df4f4f51d..34427f454 100644 --- a/sphinx/locale/__init__.py +++ b/sphinx/locale/__init__.py @@ -14,8 +14,6 @@ from collections import UserString, defaultdict from gettext import NullTranslations from typing import Any, Callable, Dict, Iterable, List, Tuple, Union -from sphinx.deprecation import RemovedInSphinx30Warning - class _TranslationProxy(UserString): """ diff --git a/sphinx/registry.py b/sphinx/registry.py index d2f9da3a1..685136470 100644 --- a/sphinx/registry.py +++ b/sphinx/registry.py @@ -23,13 +23,11 @@ from pkg_resources import iter_entry_points from sphinx.builders import Builder from sphinx.config import Config -from sphinx.deprecation import RemovedInSphinx30Warning from sphinx.domains import Domain, Index, ObjType from sphinx.domains.std import GenericObject, Target from sphinx.environment import BuildEnvironment from sphinx.errors import ExtensionError, SphinxError, VersionRequirementError from sphinx.extension import Extension -from sphinx.io import SphinxFileInput from sphinx.locale import __ from sphinx.parsers import Parser as SphinxParser from sphinx.roles import XRefRole diff --git a/sphinx/versioning.py b/sphinx/versioning.py index 0142dfb66..102a1205f 100644 --- a/sphinx/versioning.py +++ b/sphinx/versioning.py @@ -15,7 +15,6 @@ from os import path from typing import Any, Dict, Iterator from uuid import uuid4 -from docutils import nodes from docutils.nodes import Node from sphinx.transforms import SphinxTransform