IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

according to comment, move import, use six.text_type, and use 'not'.

Browse Source
This commit is contained in:
shirou 2014-08-13 00:47:01 +09:00
parent 4e70d364ba
commit 7d7ba3a7c6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sphinx/directives/code.py
View File

@ -9,10 +9,13 @@
import sys import sys
import codecs import codecs
from difflib import unified_diff
from docutils import nodes from docutils import nodes
from docutils.parsers.rst import Directive, directives from docutils.parsers.rst import Directive, directives
from six import text_type
from sphinx import addnodes from sphinx import addnodes
from sphinx.util import parselinenos from sphinx.util import parselinenos
from sphinx.util.nodes import set_source_info from sphinx.util.nodes import set_source_info
@ -180,17 +183,16 @@ class LiteralInclude(Directive):
lines = self.read_with_encoding(filename, document, lines = self.read_with_encoding(filename, document,
codec_info, encoding) codec_info, encoding)
if isinstance(lines[0], basestring) is False: if not isinstance(lines[0], six.text_type):
return lines return lines
diffsource = self.options.get('diff') diffsource = self.options.get('diff')
if diffsource is not None: if diffsource is not None:
from difflib import unified_diff
tmp, fulldiffsource = env.relfn2path(diffsource) tmp, fulldiffsource = env.relfn2path(diffsource)
difflines = self.read_with_encoding(fulldiffsource, document, difflines = self.read_with_encoding(fulldiffsource, document,
codec_info, encoding) codec_info, encoding)
if isinstance(difflines[0], basestring) is False: if not isinstance(difflines[0], six.text_type):
return difflines return difflines
diff = unified_diff( diff = unified_diff(
difflines, difflines,