apparently re.S makes things go b00m

diff --git a/doc/build/components/formatting.myt b/doc/build/components/formatting.myt
index 53575bf13ecd23a822e40d62650e6897b74c3ef7..9894b25cd666c9bd9270e9b3ff48e87d65caef80 100644 (file)
--- a/doc/build/components/formatting.myt
+++ b/doc/build/components/formatting.myt
@@ -187,7 +187,7 @@
 <%method formatplain>
     <%filter>
         import re
-        f = re.sub(r'\n[\s\t]*\n[\s\t]*', '</p>\n<p>', f, re.S)
+        f = re.sub(r'\n[\s\t]*\n[\s\t]*', '</p>\n<p>', f)
         f = "<p>" + f + "</p>"
         return f
     </%filter>

diff --git a/doc/build/components/pydoc.myt b/doc/build/components/pydoc.myt
index d90f41ef70e70c952bbd92f83b331251dd8aec3c..3314fa447a94d924b4fa50461216b4d00c43ab1b 100644 (file)
--- a/doc/build/components/pydoc.myt
+++ b/doc/build/components/pydoc.myt
@@ -1,7 +1,5 @@
 <%global>
-    import re, types, string, docstring
-    def format_paragraphs(text):
-        return re.sub(r'([_\w])\n([_\w])', r'\1 \2', text or '', re.S)
+    import docstring
 </%global>
 
 <%method obj_doc>
@@ -10,7 +8,7 @@
     </%args>
     
 <&|doclib.myt:item, name=obj.name, description=obj.description &>
-<&|formatting.myt:formatplain&><% format_paragraphs(obj.doc) %></&>
+<&|formatting.myt:formatplain&><% obj.doc %></&>
 
 % if not obj.isclass and obj.functions:
 <&|doclib.myt:item, name="modfunc", description="Module Functions" &>
@@ -48,7 +46,7 @@
 <%method function_doc>
     <%args>func</%args>
     <&|formatting.myt:function_doc, name=func.name, link=func.link, arglist=func.arglist &>
-    <&|formatting.myt:formatplain&><% format_paragraphs(func.doc) %></&>
+    <&|formatting.myt:formatplain&><% func.doc %></&>
     </&>
 </%method>
 
@@ -58,6 +56,6 @@
         prop
     </%args>
     <&|formatting.myt:member_doc, name=prop.name, link=prop.link &>
-    <&|formatting.myt:formatplain&><% format_paragraphs(prop.doc) %></&>
+    <&|formatting.myt:formatplain&><% prop.doc %></&>
     </&>    
 </%method>