diff options
| author | Georg Brandl <georg@python.org> | 2010-05-22 12:59:18 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-05-22 12:59:18 +0200 |
| commit | c8c703805c4498a77945cc6833e3e7b27631c737 (patch) | |
| tree | 19f70db5585f6cc4baefd6cf7ff3e1abcd802f9b /sphinx/directives/code.py | |
| parent | f6ace6d1190105f879bf8ba4c8065bc1655bbd85 (diff) | |
| parent | d9a4d1c1db276d41157b742d67647ec5bfd6a5cf (diff) | |
| download | sphinx-git-c8c703805c4498a77945cc6833e3e7b27631c737.tar.gz | |
merge with 0.6
Diffstat (limited to 'sphinx/directives/code.py')
| -rw-r--r-- | sphinx/directives/code.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py index 5497a3652..d82dd76d0 100644 --- a/sphinx/directives/code.py +++ b/sphinx/directives/code.py @@ -117,8 +117,10 @@ class LiteralInclude(Directive): line=self.lineno)] encoding = self.options.get('encoding', env.config.source_encoding) + codec_info = codecs.lookup(encoding) try: - f = codecs.open(fn, 'rU', encoding) + f = codecs.StreamReaderWriter(open(fn, 'U'), + codec_info.streamreader, codec_info.streamwriter, 'strict') lines = f.readlines() f.close() except (IOError, OSError): |