Skip to content

Commit

Permalink
Fix version comparison (refs: sphinx-doc#3217)
Browse files Browse the repository at this point in the history
  • Loading branch information
tk0miya committed Dec 12, 2016
1 parent 5e2e833 commit 66e8086
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions sphinx/util/docutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@

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."""
Expand Down
4 changes: 2 additions & 2 deletions sphinx/writers/html.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
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

Expand Down Expand Up @@ -535,7 +535,7 @@ def visit_image(self, node):

# 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())
Expand Down

0 comments on commit 66e8086

Please sign in to comment.