Merge branch '2.0'

1 files changed, 4 insertions, 18 deletions

diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index 5621f9a75..97774c668 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -24,7 +24,7 @@ from docutils.utils import relative_path
 
 from sphinx import package_dir, __display_version__
 from sphinx.builders import Builder
-from sphinx.deprecation import RemovedInSphinx40Warning, deprecated_alias
+from sphinx.deprecation import RemovedInSphinx40Warning
 from sphinx.environment.adapters.asset import ImageAdapter
 from sphinx.environment.adapters.indexentries import IndexEntries
 from sphinx.environment.adapters.toctree import TocTree
@@ -1187,23 +1187,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):