From 0c7a461bbbfb20f5faf8483526760d7e0327fde5 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 20 Feb 2020 20:12:23 +0000 Subject: [PATCH] Import Directive from docutils.parsers.rst sphinx.util.compat is deprecated since 1.6 and removed in 1.7. --- doc/sphinx/azhelpgen/azhelpgen.py | 6 +++++- doc/sphinx/cligroup/cligroup.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/sphinx/azhelpgen/azhelpgen.py b/doc/sphinx/azhelpgen/azhelpgen.py index 8080412de0c..b1548ed1337 100644 --- a/doc/sphinx/azhelpgen/azhelpgen.py +++ b/doc/sphinx/azhelpgen/azhelpgen.py @@ -9,7 +9,11 @@ from os.path import expanduser from docutils import nodes from docutils.statemachine import ViewList -from sphinx.util.compat import Directive +try: + # Deprecated in 1.6 and removed in 1.7 + from sphinx.util.compat import Directive +except ImportError: + from docutils.parsers.rst import Directive # pylint: disable=import-error from sphinx.util.nodes import nested_parse_with_titles diff --git a/doc/sphinx/cligroup/cligroup.py b/doc/sphinx/cligroup/cligroup.py index a332e86a9ba..91e4338c0f7 100644 --- a/doc/sphinx/cligroup/cligroup.py +++ b/doc/sphinx/cligroup/cligroup.py @@ -6,7 +6,11 @@ from docutils import nodes from sphinx import addnodes from sphinx.directives import ObjectDescription -from sphinx.util.compat import Directive +try: + # Deprecated in 1.6 and removed in 1.7 + from sphinx.util.compat import Directive +except ImportError: + from docutils.parsers.rst import Directive # pylint: disable=import-error from sphinx.util.docfields import Field cli_field_types = [