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

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

Revision: 1364
          http://svn.sourceforge.net/epydoc/?rev=1364&view=rev
Author:   edloper
Date:     2006-09-06 19:17:59 -0700 (Wed, 06 Sep 2006)

Log Message:
-----------
- Fixed bug in concatenating docstrings (descr may now be None)

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

Modified: trunk/epydoc/src/epydoc/docstringparser.py
===================================================================
--- trunk/epydoc/src/epydoc/docstringparser.py	2006-09-06 23:47:17 UTC (rev 1363)
+++ trunk/epydoc/src/epydoc/docstringparser.py	2006-09-07 02:17:59 UTC (rev 1364)
@@ -545,7 +545,7 @@
         isinstance(api_doc.container, ClassDoc)):
         _check(api_doc, tag, arg, expect_arg=False)
         api_doc.is_instvar = False
-        api_doc.descr = api_doc.descr.concatenate(descr)
+        api_doc.descr = markup.ConcatenatedDocstring(api_doc.descr, descr)
         api_doc.summary = descr.summary()
 
     # Otherwise, @cvar should be used in a class.
@@ -563,7 +563,7 @@
         _check(api_doc, tag, arg, expect_arg=False)
         # require that there be no other descr?
         api_doc.is_instvar = True
-        api_doc.descr = api_doc.descr.concatenate(descr)
+        api_doc.descr = markup.ConcatenatedDocstring(api_doc.descr, descr)
         api_doc.summary = descr.summary()
 
     # Otherwise, @ivar should be used in a class.


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