From 47ab2d088754abbff224caf026195b4f36eb7d66 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Fri, 5 Apr 2019 00:58:20 +0900 Subject: [PATCH] Fix #6245: circular import error --- CHANGES | 5 +++++ sphinxcontrib/serializinghtml/__init__.py | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/CHANGES b/CHANGES index 4ae6072..065e7b1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +Release 1.1.2 (unreleased) +========================== + +* Fix #6245: circular import error + Release 1.1.1 (2019-02-17) ========================== diff --git a/sphinxcontrib/serializinghtml/__init__.py b/sphinxcontrib/serializinghtml/__init__.py index c247656..5f74f43 100644 --- a/sphinxcontrib/serializinghtml/__init__.py +++ b/sphinxcontrib/serializinghtml/__init__.py @@ -13,6 +13,7 @@ from sphinx.application import ENV_PICKLE_FILENAME, Sphinx from sphinx.builders.html import BuildInfo, StandaloneHTMLBuilder +from sphinx.deprecation import RemovedInSphinx40Warning, deprecated_alias from sphinx.locale import get_translation from sphinx.util.osutil import SEP, copyfile, ensuredir, os_path @@ -162,6 +163,17 @@ class JSONHTMLBuilder(SerializingHTMLBuilder): searchindex_filename = 'searchindex.json' +deprecated_alias('sphinx.builders.html', + { + 'LAST_BUILD_FILENAME': LAST_BUILD_FILENAME, + 'JSONHTMLBuilder': JSONHTMLBuilder, + 'PickleHTMLBuilder': PickleHTMLBuilder, + 'SerializingHTMLBuilder': SerializingHTMLBuilder, + 'WebHTMLBuilder': PickleHTMLBuilder, + }, + RemovedInSphinx40Warning) + + def setup(app: Sphinx) -> Dict[str, Any]: app.setup_extension('sphinx.builders.html') app.add_builder(JSONHTMLBuilder)