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/ext/viewcode.py | |
| parent | 5b7432b1ab333e4fe503b08d57732da1e5a25cf3 (diff) | |
| parent | 280d2c79f835da6245c45523960b6ddf6f0088e0 (diff) | |
| download | sphinx-git-4647fcee456378c5001fe5ccbe7bff71fb799bf7.tar.gz | |
Merge branch '1.7-release'
Diffstat (limited to 'sphinx/ext/viewcode.py')
| -rw-r--r-- | sphinx/ext/viewcode.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sphinx/ext/viewcode.py b/sphinx/ext/viewcode.py index a2e8e64d3..2a152b2af 100644 --- a/sphinx/ext/viewcode.py +++ b/sphinx/ext/viewcode.py @@ -11,9 +11,8 @@ import traceback -from six import iteritems, text_type - from docutils import nodes +from six import iteritems, text_type import sphinx from sphinx import addnodes |