diff options
Diffstat (limited to 'sphinx/directives/code.py')
| -rw-r--r-- | sphinx/directives/code.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py index 15b66cceb..1df248d80 100644 --- a/sphinx/directives/code.py +++ b/sphinx/directives/code.py @@ -9,10 +9,13 @@ import sys import codecs +from difflib import unified_diff from docutils import nodes from docutils.parsers.rst import Directive, directives +from six import text_type + from sphinx import addnodes from sphinx.util import parselinenos from sphinx.util.nodes import set_source_info @@ -180,17 +183,16 @@ class LiteralInclude(Directive): lines = self.read_with_encoding(filename, document, codec_info, encoding) - if isinstance(lines[0], basestring) is False: + if not isinstance(lines[0], six.text_type): return lines diffsource = self.options.get('diff') if diffsource is not None: - from difflib import unified_diff tmp, fulldiffsource = env.relfn2path(diffsource) difflines = self.read_with_encoding(fulldiffsource, document, codec_info, encoding) - if isinstance(difflines[0], basestring) is False: + if not isinstance(difflines[0], six.text_type): return difflines diff = unified_diff( difflines, |