diff options
author | WAKAYAMA Shirou <shirou.faw@gmail.com> | 2014-08-13 12:19:19 +0900 |
---|---|---|
committer | WAKAYAMA Shirou <shirou.faw@gmail.com> | 2014-08-13 12:19:19 +0900 |
commit | e5634a050d5bfba766301a594e331a38ba4b9c59 (patch) | |
tree | 4e3b822df037d8b2b601ce104d8abe24dc18e497 | |
parent | 9d385164cbcf56e161d44e3da81e3cf032ea4856 (diff) | |
download | sphinx-e5634a050d5bfba766301a594e331a38ba4b9c59.tar.gz |
use six.string_types instead of text_types.
also fix import path problem.
-rw-r--r-- | sphinx/directives/code.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py index 1df248d8..da7dc0ca 100644 --- a/sphinx/directives/code.py +++ b/sphinx/directives/code.py @@ -14,7 +14,7 @@ from difflib import unified_diff from docutils import nodes from docutils.parsers.rst import Directive, directives -from six import text_type +from six import string_types from sphinx import addnodes from sphinx.util import parselinenos @@ -183,7 +183,7 @@ class LiteralInclude(Directive): lines = self.read_with_encoding(filename, document, codec_info, encoding) - if not isinstance(lines[0], six.text_type): + if not isinstance(lines[0], string_types): return lines diffsource = self.options.get('diff') @@ -192,7 +192,7 @@ class LiteralInclude(Directive): difflines = self.read_with_encoding(fulldiffsource, document, codec_info, encoding) - if not isinstance(difflines[0], six.text_type): + if not isinstance(difflines[0], string_types): return difflines diff = unified_diff( difflines, |