From 3c2c1550d18351e32f11d0c5bd275f3b37667f06 Mon Sep 17 00:00:00 2001 From: Amethyst Reese Date: Thu, 25 Aug 2022 20:51:07 -0700 Subject: [PATCH] Import docutils types from new locations This attempts to import ErrorString and SafeString from their new locations in docutils, and falls back to their previous locations if the import fails. Fixes #8 --- sphinx_mdinclude/sphinx.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sphinx_mdinclude/sphinx.py b/sphinx_mdinclude/sphinx.py index 44e0f87..862db30 100644 --- a/sphinx_mdinclude/sphinx.py +++ b/sphinx_mdinclude/sphinx.py @@ -6,10 +6,14 @@ import os.path from docutils import io, nodes, statemachine, utils -from docutils.core import ErrorString from docutils.parsers import rst from docutils.parsers.rst import directives as rst_directives -from docutils.utils import SafeString + +try: # new + from docutils.utils.error_reporting import ErrorString, SafeString +except ImportError: # old + from docutils.core import ErrorString # type: ignore + from docutils.utils import SafeString # type: ignore from . import RestMarkdown