Fix version comparison (refs: #3217)

This commit is contained in:
Takeshi KOMIYA
2016-12-12 20:30:59 +09:00
parent 5e2e833599
commit 66e8086440
2 changed files with 6 additions and 2 deletions
+4
View File
@@ -12,9 +12,13 @@ from __future__ import absolute_import
from copy import copy
from contextlib import contextmanager
import docutils
from docutils.parsers.rst import directives, roles
__version_info__ = tuple(map(int, docutils.__version__.split('.')))
@contextmanager
def docutils_namespace():
"""Create namespace for reST parsers."""
+2 -2
View File
@@ -16,13 +16,13 @@ import copy
import warnings
from six import string_types
import docutils
from docutils import nodes
from docutils.writers.html4css1 import Writer, HTMLTranslator as BaseTranslator
from sphinx import addnodes
from sphinx.deprecation import RemovedInSphinx16Warning
from sphinx.locale import admonitionlabels, _
import sphinx.util.docutils
from sphinx.util.images import get_image_size
from sphinx.util.smartypants import sphinx_smarty_pants
@@ -535,7 +535,7 @@ class HTMLTranslator(BaseTranslator):
# overwritten
def depart_image(self, node):
if docutils.__version__ >= "0.13":
if sphinx.util.docutils.__version_info__ >= (0, 13):
# since docutils-0.13, HTMLWriter does not push context data on visit_image()
if node['uri'].lower().endswith(('svg', 'svgz')):
self.body.append(self.context.pop())