Merge branch 'stable' into 1.6-release

This commit is contained in:
Takeshi KOMIYA
2017-05-13 15:42:03 +09:00
5 changed files with 16 additions and 3 deletions

View File

@@ -29,3 +29,10 @@ module
.. py:class:: ModTopLevel
* Link to :py:class:`ModNoModule`
.. py:function:: foo(x, y)
:param x: param x
:type x: int
:param y: param y
:type y: tuple(str, float)

View File

@@ -109,7 +109,11 @@ def test_domain_py_xrefs(app, status, warning):
'ModTopLevel', 'class')
assert_refnode(refnodes[6], 'module_b.submodule', 'ModTopLevel',
'ModNoModule', 'class')
assert len(refnodes) == 7
assert_refnode(refnodes[7], False, False, 'int', 'obj')
assert_refnode(refnodes[8], False, False, 'tuple', 'obj')
assert_refnode(refnodes[9], False, False, 'str', 'obj')
assert_refnode(refnodes[10], False, False, 'float', 'obj')
assert len(refnodes) == 11
@pytest.mark.sphinx('dummy', testroot='domain-py')