IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2026-09-03 20:52:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable' into 1.5-release

Browse Source
This commit is contained in:
Takeshi KOMIYA
2016-12-03 21:05:18 +09:00
parent 7fccbea1ae 794e0801f8
commit f43a02ca27
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -283,6 +283,7 @@ Bugs fixed
* #3015: fix a broken test on Windows. * #3015: fix a broken test on Windows.
* #1843: Fix documentation of descriptor classes that have a custom metaclass. * #1843: Fix documentation of descriptor classes that have a custom metaclass.
Thanks to Erik Bray. Thanks to Erik Bray.
* #3190: util.split_docinfo fails to parse multi-line field bodies
Release 1.4.9 (released Nov 23, 2016) Release 1.4.9 (released Nov 23, 2016)
===================================== =====================================
sphinx/util/__init__.py
+1 -1
View File
@@ -506,7 +506,7 @@ def encode_uri(uri):
def split_docinfo(text): def split_docinfo(text):
docinfo_re = re.compile('\A((?:\s*:\w+:.*?\n)+)', re.M) docinfo_re = re.compile('\A((?:\s*:\w+:.*?\n(?:[ \t]+.*?\n)*)+)', re.M)
result = docinfo_re.split(text, 1) result = docinfo_re.split(text, 1)
if len(result) == 1: if len(result) == 1:
return '', result[0] return '', result[0]
tests/test_util.py
+5
View File
@@ -41,3 +41,8 @@ def test_splitdocinfo():
docinfo, content = split_docinfo(source) docinfo, content = split_docinfo(source)
assert docinfo == ':author: Georg Brandl\n:title: Manual of Sphinx\n' assert docinfo == ':author: Georg Brandl\n:title: Manual of Sphinx\n'
assert content == '\nHello world.\n' assert content == '\nHello world.\n'
source = ":multiline: one\n\ttwo\n\tthree\n\nHello world.\n"
docinfo, content = split_docinfo(source)
assert docinfo == ":multiline: one\n\ttwo\n\tthree\n"
assert content == '\nHello world.\n'