summaryrefslogtreecommitdiff
path: root/sphinx/directives
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-14 17:08:17 +0200
committerGeorg Brandl <georg@python.org>2010-08-14 17:08:17 +0200
commit81a7a8eab8e077857e3a74bf72a4d28c12682049 (patch)
treeca541ade7509eb64c928aeb330098b47873233b1 /sphinx/directives
parent08d036efe0c50d896c9f68def195d6aff978a7e2 (diff)
parent7bc8d95bc039662fce961f199edc02efd2f10967 (diff)
downloadsphinx-81a7a8eab8e077857e3a74bf72a4d28c12682049.tar.gz
merge with 1.0
Diffstat (limited to 'sphinx/directives')
-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 0647daf0..1808cdab 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -119,7 +119,7 @@ class LiteralInclude(Directive):
encoding = self.options.get('encoding', env.config.source_encoding)
codec_info = codecs.lookup(encoding)
try:
- f = codecs.StreamReaderWriter(open(fn, 'U'),
+ f = codecs.StreamReaderWriter(open(fn, 'rb'),
codec_info[2], codec_info[3], 'strict')
lines = f.readlines()
f.close()