summaryrefslogtreecommitdiff
path: root/sphinx/directives/code.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-06-05 18:39:48 +0200
committerGeorg Brandl <georg@python.org>2010-06-05 18:39:48 +0200
commit996339593e31a870fe7114dc2e45d2d96351581d (patch)
tree63368600a8299b2ddb8a881d3077c1c1437d9b6a /sphinx/directives/code.py
parent3ff350c4d9ccf192a25f3b9af9b93263357f36b3 (diff)
parent7eb85e159a23526b823a636ccc956d61be1fba16 (diff)
downloadsphinx-git-996339593e31a870fe7114dc2e45d2d96351581d.tar.gz
merge with 0.6
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 d82dd76d0..aff4395fb 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -120,7 +120,7 @@ class LiteralInclude(Directive):
codec_info = codecs.lookup(encoding)
try:
f = codecs.StreamReaderWriter(open(fn, 'U'),
- codec_info.streamreader, codec_info.streamwriter, 'strict')
+ codec_info[2], codec_info[3], 'strict')
lines = f.readlines()
f.close()
except (IOError, OSError):