Add new env method to get the real path to a file reference, and use it.

1 files changed, 5 insertions, 19 deletions

diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index 1808cdab..d235c4ca 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -7,10 +7,8 @@
     :license: BSD, see LICENSE for details.
 """
 
-import os
 import sys
 import codecs
-from os import path
 
 from docutils import nodes
 from docutils.parsers.rst import Directive, directives
@@ -93,23 +91,11 @@ class LiteralInclude(Directive):
 
     def run(self):
         document = self.state.document
-        filename = self.arguments[0]
         if not document.settings.file_insertion_enabled:
             return [document.reporter.warning('File insertion disabled',
                                               line=self.lineno)]
         env = document.settings.env
-        if filename.startswith('/') or filename.startswith(os.sep):
-            rel_fn = filename[1:]
-        else:
-            docdir = path.dirname(env.doc2path(env.docname, base=None))
-            rel_fn = path.join(docdir, filename)
-        try:
-            fn = path.join(env.srcdir, rel_fn)
-        except UnicodeDecodeError:
-            # the source directory is a bytestring with non-ASCII characters;
-            # let's try to encode the rel_fn in the file system encoding
-            rel_fn = rel_fn.encode(sys.getfilesystemencoding())
-            fn = path.join(env.srcdir, rel_fn)
+        rel_filename, filename = env.relfn2path(self.arguments[0])
 
         if 'pyobject' in self.options and 'lines' in self.options:
             return [document.reporter.warning(
@@ -119,7 +105,7 @@ class LiteralInclude(Directive):
         encoding = self.options.get('encoding', env.config.source_encoding)
         codec_info = codecs.lookup(encoding)
         try:
-            f = codecs.StreamReaderWriter(open(fn, 'rb'),
+            f = codecs.StreamReaderWriter(open(filename, 'rb'),
                     codec_info[2], codec_info[3], 'strict')
             lines = f.readlines()
             f.close()
@@ -136,7 +122,7 @@ class LiteralInclude(Directive):
         objectname = self.options.get('pyobject')
         if objectname is not None:
             from sphinx.pycode import ModuleAnalyzer
-            analyzer = ModuleAnalyzer.for_file(fn, '')
+            analyzer = ModuleAnalyzer.for_file(filename, '')
             tags = analyzer.find_tags()
             if objectname not in tags:
                 return [document.reporter.warning(
@@ -178,13 +164,13 @@ class LiteralInclude(Directive):
         text = ''.join(lines)
         if self.options.get('tab-width'):
             text = text.expandtabs(self.options['tab-width'])
-        retnode = nodes.literal_block(text, text, source=fn)
+        retnode = nodes.literal_block(text, text, source=filename)
         retnode.line = 1
         if self.options.get('language', ''):
             retnode['language'] = self.options['language']
         if 'linenos' in self.options:
             retnode['linenos'] = True
-        document.settings.env.note_dependency(rel_fn)
+        env.note_dependency(rel_filename)
         return [retnode]