[Epydoc-commits] SF.net SVN: epydoc: [1570] branches/exp-text_node/epydoc/src/epydoc

[<dva...@us...>]

Revision: 1570
          http://svn.sourceforge.net/epydoc/?rev=1570&view=rev
Author:   dvarrazzo
Date:     2007-03-04 18:18:17 -0800 (Sun, 04 Mar 2007)

Log Message:
-----------
- Fixed unrequired encoding.
- Tests updated with the newly generated HTML (there are always <p> tags).

Modified Paths:
--------------
    branches/exp-text_node/epydoc/src/epydoc/markup/epytext.py
    branches/exp-text_node/epydoc/src/epydoc/test/encoding.doctest
    branches/exp-text_node/epydoc/src/epydoc/test/epytext.doctest

Modified: branches/exp-text_node/epydoc/src/epydoc/markup/epytext.py
===================================================================
--- branches/exp-text_node/epydoc/src/epydoc/markup/epytext.py	2007-03-05 01:52:05 UTC (rev 1569)
+++ branches/exp-text_node/epydoc/src/epydoc/markup/epytext.py	2007-03-05 02:18:17 UTC (rev 1570)
@@ -1780,7 +1780,7 @@
         if tree.tag == 'para':
             return wordwrap('<p>%s</p>' % childstr, indent)
         if tree.tag == 'text':
-            return wordwrap(str(childstr), indent)
+            return wordwrap('%s' % childstr, indent)
         elif tree.tag == 'code':
             style = tree.attribs.get('style')
             if style:

Modified: branches/exp-text_node/epydoc/src/epydoc/test/encoding.doctest
===================================================================
--- branches/exp-text_node/epydoc/src/epydoc/test/encoding.doctest	2007-03-05 01:52:05 UTC (rev 1569)
+++ branches/exp-text_node/epydoc/src/epydoc/test/encoding.doctest	2007-03-05 02:18:17 UTC (rev 1570)
@@ -27,27 +27,27 @@
     >>> testencoding('''# -*- coding: cp874 -*-
     ... """abc ABC 123 \x80 \x85"""
     ... ''')
-    abc ABC 123 &#8364; &#8230;
+    <p>abc ABC 123 &#8364; &#8230;</p>
 
     >>> testencoding('''# -*- coding: cp1250 -*-
     ... """abc ABC 123 \x80 \x82 \x84 \x85 \xff"""
     ... ''')
-    abc ABC 123 &#8364; &#8218; &#8222; &#8230; &#729;
+    <p>abc ABC 123 &#8364; &#8218; &#8222; &#8230; &#729;</p>
 
     >>> testencoding('''# -*- coding: cp1251 -*-
     ... """abc ABC 123 \x80 \x81 \x82 \xff"""
     ... ''')
-    abc ABC 123 &#1026; &#1027; &#8218; &#1103;
+    <p>abc ABC 123 &#1026; &#1027; &#8218; &#1103;</p>
 
     >>> testencoding('''# -*- coding: cp1252 -*-
     ... """abc ABC 123 \x80 \x82 \x83 \xff"""
     ... ''')
-    abc ABC 123 &#8364; &#8218; &#402; &#255;
+    <p>abc ABC 123 &#8364; &#8218; &#402; &#255;</p>
 
     >>> testencoding('''# -*- coding: cp1253 -*-
     ... """abc ABC 123 \x80 \x82 \x83 \xfe"""
     ... ''')
-    abc ABC 123 &#8364; &#8218; &#402; &#974;
+    <p>abc ABC 123 &#8364; &#8218; &#402; &#974;</p>
 
 Unicode tests:
 
@@ -71,52 +71,52 @@
     <p>abc ABC 123</p>
     <p>0x80-0x7ff range: &#128; &#129; &#2046; &#2047;</p>
     <p>0x800-0xffff range: &#2048; &#2049; &#65534; &#65535;</p>
-    0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;
+    <p>0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;</p>
 
     >>> # UTF-8 with a BOM & a coding directive:
     >>> testencoding(utf8_bom+"# -*- coding: utf-8 -*-\n"+utf8_test)
     <p>abc ABC 123</p>
     <p>0x80-0x7ff range: &#128; &#129; &#2046; &#2047;</p>
     <p>0x800-0xffff range: &#2048; &#2049; &#65534; &#65535;</p>
-    0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;
+    <p>0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;</p>
 
     >>> # UTF-8 with a BOM & no coding directive:
     >>> testencoding(utf8_bom+utf8_test)
     <p>abc ABC 123</p>
     <p>0x80-0x7ff range: &#128; &#129; &#2046; &#2047;</p>
     <p>0x800-0xffff range: &#2048; &#2049; &#65534; &#65535;</p>
-    0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;
+    <p>0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;</p>
 
 Tests for KOI8-R:
 
     >>> testencoding('''# -*- coding: koi8-r -*-
     ... """abc ABC 123 \x80 \x82 \x83 \xff"""
     ... ''')
-    abc ABC 123 &#9472; &#9484; &#9488; &#1066;
+    <p>abc ABC 123 &#9472; &#9484; &#9488; &#1066;</p>
 
 Tests for 'coding' directive on the second line:
 
     >>> testencoding('''\n# -*- coding: cp1252 -*-
     ... """abc ABC 123 \x80 \x82 \x83 \xff"""
     ... ''')
-    abc ABC 123 &#8364; &#8218; &#402; &#255;
+    <p>abc ABC 123 &#8364; &#8218; &#402; &#255;</p>
     
     >>> testencoding('''# comment on the first line.\n# -*- coding: cp1252 -*-
     ... """abc ABC 123 \x80 \x82 \x83 \xff"""
     ... ''')
-    abc ABC 123 &#8364; &#8218; &#402; &#255;
+    <p>abc ABC 123 &#8364; &#8218; &#402; &#255;</p>
 
     >>> testencoding("\n# -*- coding: utf-8 -*-\n"+utf8_test)
     <p>abc ABC 123</p>
     <p>0x80-0x7ff range: &#128; &#129; &#2046; &#2047;</p>
     <p>0x800-0xffff range: &#2048; &#2049; &#65534; &#65535;</p>
-    0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;
+    <p>0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;</p>
 
     >>> testencoding("# comment\n# -*- coding: utf-8 -*-\n"+utf8_test)
     <p>abc ABC 123</p>
     <p>0x80-0x7ff range: &#128; &#129; &#2046; &#2047;</p>
     <p>0x800-0xffff range: &#2048; &#2049; &#65534; &#65535;</p>
-    0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;
+    <p>0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;</p>
 
 Tests for shift-jis
 
@@ -132,12 +132,12 @@
     >>> testencoding('''# -*- coding: utf-8 -*-
     ... """abc ABC 123 \xc2\x80 \xdf\xbf \xe0\xa0\x80"""
     ... ''')
-    abc ABC 123 &#128; &#2047; &#2048;
+    <p>abc ABC 123 &#128; &#2047; &#2048;</p>
 
     >>> testencoding('''# -*- coding: utf-8 -*-
     ... u"""abc ABC 123 \xc2\x80 \xdf\xbf \xe0\xa0\x80"""
     ... ''')
-    abc ABC 123 &#128; &#2047; &#2048;
+    <p>abc ABC 123 &#128; &#2047; &#2048;</p>
 
 Under special circumstances, we may not be able to tell what the
 proper encoding for a docstring is.  This happens if:
@@ -166,33 +166,33 @@
     <p>abc ABC 123</p>
     <p>0x80-0x7ff range: &#128; &#129; &#2046; &#2047;</p>
     <p>0x800-0xffff range: &#2048; &#2049; &#65534; &#65535;</p>
-    0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;
+    <p>0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;</p>
     >>> testencoding(utf8_bom+"# -*- coding: utf-8 -*-\n"+utf8_test, introspect=False)
     <p>abc ABC 123</p>
     <p>0x80-0x7ff range: &#128; &#129; &#2046; &#2047;</p>
     <p>0x800-0xffff range: &#2048; &#2049; &#65534; &#65535;</p>
-    0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;
+    <p>0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;</p>
     >>> testencoding(utf8_bom+utf8_test, introspect=False)
     <p>abc ABC 123</p>
     <p>0x80-0x7ff range: &#128; &#129; &#2046; &#2047;</p>
     <p>0x800-0xffff range: &#2048; &#2049; &#65534; &#65535;</p>
-    0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;
+    <p>0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;</p>
 
     >>> testencoding("# -*- coding: utf-8 -*-\n"+utf8_test, parse=False)
     <p>abc ABC 123</p>
     <p>0x80-0x7ff range: &#128; &#129; &#2046; &#2047;</p>
     <p>0x800-0xffff range: &#2048; &#2049; &#65534; &#65535;</p>
-    0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;
+    <p>0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;</p>
     >>> testencoding(utf8_bom+"# -*- coding: utf-8 -*-\n"+utf8_test, parse=False)
     <p>abc ABC 123</p>
     <p>0x80-0x7ff range: &#128; &#129; &#2046; &#2047;</p>
     <p>0x800-0xffff range: &#2048; &#2049; &#65534; &#65535;</p>
-    0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;
+    <p>0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;</p>
     >>> testencoding(utf8_bom+utf8_test, parse=False)
     <p>abc ABC 123</p>
     <p>0x80-0x7ff range: &#128; &#129; &#2046; &#2047;</p>
     <p>0x800-0xffff range: &#2048; &#2049; &#65534; &#65535;</p>
-    0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;
+    <p>0x10000-0x10ffff range: &#65536; &#65537; &#1114110; &#1114111;</p>
 
 Context checks
 ==============
@@ -219,12 +219,12 @@
     ... ''')
     abc ABC 123 &#128; &#2047; &#2048;
     abc ABC 123 &#128; &#2047; &#2048;
+    <p>abc ABC 123 &#128; &#2047; &#2048;</p>
     abc ABC 123 &#128; &#2047; &#2048;
     abc ABC 123 &#128; &#2047; &#2048;
     abc ABC 123 &#128; &#2047; &#2048;
     abc ABC 123 &#128; &#2047; &#2048;
     abc ABC 123 &#128; &#2047; &#2048;
-    abc ABC 123 &#128; &#2047; &#2048;
 
     >>> testencoding('''# -*- coding: utf-8 -*-
     ... class A:
@@ -238,11 +238,11 @@
     ...     z = property(doc=u"abc ABC 123 \xc2\x80 \xdf\xbf \xe0\xa0\x80")
     ... ''')
     abc ABC 123 &#128; &#2047; &#2048;
+    <p>abc ABC 123 &#128; &#2047; &#2048;</p>
     abc ABC 123 &#128; &#2047; &#2048;
     abc ABC 123 &#128; &#2047; &#2048;
     abc ABC 123 &#128; &#2047; &#2048;
     abc ABC 123 &#128; &#2047; &#2048;
-    abc ABC 123 &#128; &#2047; &#2048;
 
 
 

Modified: branches/exp-text_node/epydoc/src/epydoc/test/epytext.doctest
===================================================================
--- branches/exp-text_node/epydoc/src/epydoc/test/epytext.doctest	2007-03-05 01:52:05 UTC (rev 1569)
+++ branches/exp-text_node/epydoc/src/epydoc/test/epytext.doctest	2007-03-05 02:18:17 UTC (rev 1570)
@@ -298,14 +298,14 @@
 ...     return (v or '').rstrip()
 
 >>> print epytext2html("{1:{2:3}}")
-{1:{2:3}}
+<p>{1:{2:3}}</p>
 >>> print epytext2html("C{{1:{2:3}}}")
-<code>{1:{2:3}}</code>
+<p><code>{1:{2:3}}</code></p>
 >>> print epytext2html("{1:C{{2:3}}}")
-{1:<code>{2:3}</code>}
+<p>{1:<code>{2:3}</code>}</p>
 >>> print epytext2html("{{{}{}}{}}")
-{{{}{}}{}}
+<p>{{{}{}}{}}</p>
 >>> print epytext2html("{{E{lb}E{lb}E{lb}}}")
-{{{{{}}
+<p>{{{{{}}</p>
 
 


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