diff options
| author | Georg Brandl <georg@python.org> | 2010-08-05 16:20:12 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-05 16:20:12 +0200 |
| commit | efd0459770566d40f41e11371ae4fbb5ba1359f1 (patch) | |
| tree | a5149c2b2f38555682917634ff7ffe03b33a6bff /tests/root | |
| parent | a1706a0d3d654e605dda77b2649327bf7066dc02 (diff) | |
| parent | ac9d5434eefe66b336f7cee5599f253aaea6b70f (diff) | |
| download | sphinx-efd0459770566d40f41e11371ae4fbb5ba1359f1.tar.gz | |
merge with 1.0
Diffstat (limited to 'tests/root')
| -rw-r--r-- | tests/root/objects.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/root/objects.txt b/tests/root/objects.txt index 334827de..e62f6d96 100644 --- a/tests/root/objects.txt +++ b/tests/root/objects.txt @@ -41,6 +41,10 @@ Testing object descriptions .. function:: func_without_module2() -> annotation +.. object:: long(parameter, \ + list) + another one + .. class:: TimeInt :param moo: |test| @@ -62,6 +66,8 @@ Testing object descriptions :ivar int hour: like *hour* :ivar minute: like *minute* :vartype minute: int + :param hour: Duplicate param. Should not lead to crashes. + :type hour: Duplicate type. C items |