summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWAKAYAMA Shirou <shirou.faw@gmail.com>2014-08-13 00:47:01 +0900
committerWAKAYAMA Shirou <shirou.faw@gmail.com>2014-08-13 00:47:01 +0900
commit9d385164cbcf56e161d44e3da81e3cf032ea4856 (patch)
treeb9f7d87766404d59c1b36797137d6d46abc5283f
parent0faba5d6ad6bb826df26f1d9972fe00bd6845ebb (diff)
downloadsphinx-9d385164cbcf56e161d44e3da81e3cf032ea4856.tar.gz
according to comment, move import, use six.text_type, and use 'not'.
-rw-r--r--sphinx/directives/code.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index 15b66cce..1df248d8 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,