IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for 12fea70b1a18: EncodedFile doesnt do the right thing either.

Browse Source
This commit is contained in:
Georg Brandl 2010-05-22 12:07:05 +02:00
parent d1027d6057
commit d9a4d1c1db
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sphinx/directives/code.py
View File

@ -115,8 +115,10 @@ class LiteralInclude(Directive):
line=self.lineno)] line=self.lineno)]
encoding = self.options.get('encoding', env.config.source_encoding) encoding = self.options.get('encoding', env.config.source_encoding)
codec_info = codecs.lookup(encoding)
try: try:
f = codecs.EncodedFile(open(fn, 'U'), encoding) f = codecs.StreamReaderWriter(open(fn, 'U'),
codec_info.streamreader, codec_info.streamwriter, 'strict')
lines = f.readlines() lines = f.readlines()
f.close() f.close()
except (IOError, OSError): except (IOError, OSError):