Merge pull request #3225 from tk0miya/3217_docutils_version_comparison

Fix version comparison (refs: #3217)

2 files changed, 6 insertions, 2 deletions

diff --git a/sphinx/util/docutils.py b/sphinx/util/docutils.py
index be9e2edad..8d1d58cf8 100644
--- a/sphinx/util/docutils.py
+++ b/sphinx/util/docutils.py
@@ -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."""
diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index 07d16f870..76ad8dea1 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -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())