Skip to content

{doc} Import Directive from docutils.parsers.rst #12295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haroldrandom merged 1 commit into from
Feb 23, 2020
Merged

{doc} Import Directive from docutils.parsers.rst #12295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion doc/sphinx/azhelpgen/azhelpgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
6 changes: 5 additions & 1 deletion doc/sphinx/cligroup/cligroup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down