Merge branch 'master' of github.com:lsaffre/ablog into devel

This commit is contained in:
Stuart Mumford 2017-06-19 17:45:07 +01:00
commit a91c1ab8e2
No known key found for this signature in database
GPG key ID: 60BC5C03E6276769

View file

@ -13,7 +13,12 @@ except ImportError:
from docutils import nodes
from sphinx.locale import _
from sphinx.util.nodes import set_source_info
from sphinx.util.compat import Directive, make_admonition
from sphinx.util.compat import Directive
# DeprecationWarning: make_admonition is deprecated, use docutils.parsers.rst.directives.admonitions.BaseAdmonition instead
try:
from sphinx.util.compat import make_admonition
except ImportError:
from docutils.parsers.rst.directives.admonitions import BaseAdmonition as make_admonition
from docutils.parsers.rst import directives
from docutils.utils import relative_path