diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-01-31 20:40:56 +0900 |
---|---|---|
committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-01-31 20:40:56 +0900 |
commit | 4647fcee456378c5001fe5ccbe7bff71fb799bf7 (patch) | |
tree | f3ff5f85e45bd79979ddae5af2c157bdfeaa5001 /sphinx/builders/devhelp.py | |
parent | 5b7432b1ab333e4fe503b08d57732da1e5a25cf3 (diff) | |
parent | 280d2c79f835da6245c45523960b6ddf6f0088e0 (diff) | |
download | sphinx-git-4647fcee456378c5001fe5ccbe7bff71fb799bf7.tar.gz |
Merge branch '1.7-release'
Diffstat (limited to 'sphinx/builders/devhelp.py')
-rw-r--r-- | sphinx/builders/devhelp.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/builders/devhelp.py b/sphinx/builders/devhelp.py index 4a0d735c1..2559ba778 100644 --- a/sphinx/builders/devhelp.py +++ b/sphinx/builders/devhelp.py @@ -12,17 +12,17 @@ """ from __future__ import absolute_import -import re import gzip +import re from os import path from docutils import nodes from sphinx import addnodes -from sphinx.util import logging -from sphinx.util.osutil import make_filename from sphinx.builders.html import StandaloneHTMLBuilder from sphinx.environment.adapters.indexentries import IndexEntries +from sphinx.util import logging +from sphinx.util.osutil import make_filename try: import xml.etree.ElementTree as etree |