merge with 0.6

This commit is contained in:
Georg Brandl 2010-06-05 18:39:48 +02:00
commit 996339593e
2 changed files with 11 additions and 1 deletions

10
CHANGES
View File

@ -154,6 +154,16 @@ Features added
Release 0.6.7 (in development)
==============================
* #440: Remove usage of a Python >= 2.5 API in the ``literalinclude``
directive.
* Fix a bug that prevented some references being generated in the
LaTeX builder.
* #428: Add some missing CSS styles for standard docutils classes.
* #432: Fix UnicodeErrors while building LaTeX in translated locale.
Release 0.6.6 (May 25, 2010)
============================

View File

@ -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):