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

merge with 0.5

Browse Source
This commit is contained in:
Georg Brandl 2009-01-26 22:42:00 +01:00
commit 257d630c6d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -103,6 +103,9 @@ New features added
Release 0.5.2 (in development)
==============================
* Open literalinclude files in universal newline mode to allow
arbitrary newline conventions.
* Actually make the ``-Q`` option work.
* #86: Fix explicit document titles in toctrees.

2
sphinx/directives/code.py
View File

@ -75,7 +75,7 @@ def literalinclude_directive(name, arguments, options, content, lineno,
encoding = options.get('encoding', env.config.source_encoding)
try:
f = codecs.open(fn, 'r', encoding)
f = codecs.open(fn, 'rU', encoding)
lines = f.readlines()
f.close()
except (IOError, OSError):