[Epydoc-commits] SF.net SVN: epydoc: [1623] trunk/epydoc/src/epydoc/docstringparser.py

[<ed...@us...>]

Revision: 1623
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1623&view=rev
Author:   edloper
Date:     2007-09-23 12:25:54 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
- fixed sf bug [ 1658475 ] weird warning with property() -- applied
  patch supplied by dvarrazzo.

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/docstringparser.py

Modified: trunk/epydoc/src/epydoc/docstringparser.py
===================================================================
--- trunk/epydoc/src/epydoc/docstringparser.py	2007-09-23 19:18:08 UTC (rev 1622)
+++ trunk/epydoc/src/epydoc/docstringparser.py	2007-09-23 19:25:54 UTC (rev 1623)
@@ -774,11 +774,19 @@
     api_doc.return_descr = descr
 
 def process_rtype_field(api_doc, docindex, tag, arg, descr):
-    _check(api_doc, tag, arg, context=RoutineDoc, expect_arg=False)
-    if api_doc.return_type is not None:
-        raise ValueError(REDEFINED % 'return value type')
-    api_doc.return_type = descr
+    _check(api_doc, tag, arg,
+           context=(RoutineDoc, PropertyDoc), expect_arg=False)
+    if isinstance(api_doc, RoutineDoc):
+        if api_doc.return_type is not None:
+            raise ValueError(REDEFINED % 'return value type')
+        api_doc.return_type = descr
 
+    elif isinstance(api_doc, PropertyDoc):
+        _check(api_doc, tag, arg, expect_arg=False)
+        if api_doc.type_descr is not None:
+            raise ValueError(REDEFINED % tag)
+        api_doc.type_descr = descr
+
 def process_arg_field(api_doc, docindex, tag, arg, descr):
     _check(api_doc, tag, arg, context=RoutineDoc, expect_arg=True)
     idents = re.split('[:;, ] *', arg)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.