summaryrefslogtreecommitdiff
path: root/sphinx/directives/code.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-01-26 22:44:38 +0100
committerGeorg Brandl <georg@python.org>2009-01-26 22:44:38 +0100
commitd1e61194619376a95c417edc22b86acf4a3e585b (patch)
tree14f6bc260a2777e651ce7abb59c6ab5f76684dac /sphinx/directives/code.py
parent55c4f5a096f4c7619180098dec95ff6cefb51e11 (diff)
parent257d630c6d4a4a6a9f5212b156504d6a77178c60 (diff)
downloadsphinx-git-d1e61194619376a95c417edc22b86acf4a3e585b.tar.gz
merge with trunk
Diffstat (limited to 'sphinx/directives/code.py')
-rw-r--r--sphinx/directives/code.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index da68cf2e2..3162d5575 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -78,7 +78,7 @@ def literalinclude_directive(name, arguments, options, content, lineno,
encoding = options.get('encoding', env.config.source_encoding)
try:
- f = codecs.open(fn, 'r', encoding)
+ f = codecs.open(fn, 'rU', encoding)
lines = f.readlines()
f.close()
except (IOError, OSError):