From 528a06ff4eba72c473e9dcbb14cb522c607093a3 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 25 Oct 2008 16:40:59 +0000 Subject: [PATCH] Don't disregard return annotations for functions without any parameters. --- CHANGES | 2 ++ sphinx/directives/desc.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 8d43ca2cd..7a2ad1228 100644 --- a/CHANGES +++ b/CHANGES @@ -140,6 +140,8 @@ Bugs fixed * Fix a problem with index generation in LaTeX output, caused by hyperref not being included last. +* Don't disregard return annotations for functions without any parameters. + Release 0.4.3 (Oct 8, 2008) =========================== diff --git a/sphinx/directives/desc.py b/sphinx/directives/desc.py index ee6d13674..9f1b478eb 100644 --- a/sphinx/directives/desc.py +++ b/sphinx/directives/desc.py @@ -199,6 +199,9 @@ def parse_py_signature(signode, sig, desctype, module, env): raise ValueError classname, name, arglist, retann = m.groups() + if retann: + retann = u' \N{RIGHTWARDS ARROW} ' + retann.strip()[2:] + if env.currclass: add_module = False if classname and classname.startswith(env.currclass): @@ -233,6 +236,8 @@ def parse_py_signature(signode, sig, desctype, module, env): if desctype in ('function', 'method', 'staticmethod'): # for callables, add an empty parameter list signode += addnodes.desc_parameterlist() + if retann: + signode += addnodes.desc_type(retann, retann) return fullname, classname signode += addnodes.desc_parameterlist() @@ -255,7 +260,6 @@ def parse_py_signature(signode, sig, desctype, module, env): if len(stack) != 1: raise ValueError if retann: - retann = u' \N{RIGHTWARDS ARROW} ' + retann.strip()[2:] signode += addnodes.desc_type(retann, retann) return fullname, classname