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

This commit is contained in:
Georg Brandl 2010-05-22 12:07:05 +02:00
parent d1027d6057
commit d9a4d1c1db

View File

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