summaryrefslogtreecommitdiff
path: root/sphinx/builders/html.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2019-04-05 01:05:22 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2019-04-05 01:16:25 +0900
commit9dfbfbf16b9873de3ff94984e40b5bc41e28005e (patch)
treeee891c47020ab9564f518bd4b596fbb96a34f4f4 /sphinx/builders/html.py
parentd34302a41514f82075dea8d1e6b1088f6e57768a (diff)
downloadsphinx-git-9dfbfbf16b9873de3ff94984e40b5bc41e28005e.tar.gz
Fix #6245: circular import error on importing SerializingHTMLBuilder
Diffstat (limited to 'sphinx/builders/html.py')
-rw-r--r--sphinx/builders/html.py24
1 files changed, 4 insertions, 20 deletions
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index 3f167d0d3..287b96a92 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -24,9 +24,7 @@ from docutils.utils import relative_path
from sphinx import package_dir, __display_version__
from sphinx.builders import Builder
-from sphinx.deprecation import (
- RemovedInSphinx30Warning, RemovedInSphinx40Warning, deprecated_alias
-)
+from sphinx.deprecation import RemovedInSphinx30Warning, RemovedInSphinx40Warning
from sphinx.environment.adapters.asset import ImageAdapter
from sphinx.environment.adapters.indexentries import IndexEntries
from sphinx.environment.adapters.toctree import TocTree
@@ -1232,23 +1230,9 @@ def validate_math_renderer(app):
# for compatibility
-from sphinx.builders.dirhtml import DirectoryHTMLBuilder # NOQA
-from sphinx.builders.singlehtml import SingleFileHTMLBuilder # NOQA
-from sphinxcontrib.serializinghtml import ( # NOQA
- LAST_BUILD_FILENAME, JSONHTMLBuilder, PickleHTMLBuilder, SerializingHTMLBuilder
-)
-
-deprecated_alias('sphinx.builders.html',
- {
- 'LAST_BUILD_FILENAME': LAST_BUILD_FILENAME,
- 'DirectoryHTMLBuilder': DirectoryHTMLBuilder,
- 'JSONHTMLBuilder': JSONHTMLBuilder,
- 'PickleHTMLBuilder': PickleHTMLBuilder,
- 'SerializingHTMLBuilder': SerializingHTMLBuilder,
- 'SingleFileHTMLBuilder': SingleFileHTMLBuilder,
- 'WebHTMLBuilder': PickleHTMLBuilder,
- },
- RemovedInSphinx40Warning)
+import sphinx.builders.dirhtml # NOQA
+import sphinx.builders.singlehtml # NOQA
+import sphinxcontrib.serializinghtml # NOQA
def setup(app):