summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-05-15 12:58:34 +0200
committerGeorg Brandl <georg@python.org>2011-05-15 12:58:34 +0200
commit591da53b65573b6eef0c5e03bd06eaad4ae7527e (patch)
treec8ec2550e0a3bfc9d9eb748ce7806ce6f71bc6cc
parent97561f99e3f7868348841f5798071740b5f0f62a (diff)
downloadsphinx-591da53b65573b6eef0c5e03bd06eaad4ae7527e.tar.gz
Closes #670: Allow docutils "standard includes" to be again specified with the ``include`` directive.
-rw-r--r--sphinx/directives/other.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py
index 246d6403..7647e738 100644
--- a/sphinx/directives/other.py
+++ b/sphinx/directives/other.py
@@ -347,6 +347,10 @@ class Include(BaseInclude):
def run(self):
env = self.state.document.settings.env
+ if self.arguments[0].startswith('<') and \
+ self.arguments[0].endswith('>'):
+ # docutils "standard" includes, do not do path processing
+ return BaseInclude.run(self)
rel_filename, filename = env.relfn2path(self.arguments[0])
self.arguments[0] = filename
return BaseInclude.run(self)