[Epydoc-commits] SF.net SVN: epydoc: [1467] trunk/epydoc/src/epydoc

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1467
          http://svn.sourceforge.net/epydoc/?rev=1467&view=rev
Author:   edloper
Date:     2007-02-13 00:21:20 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
- Removed unnecessary <code class="pyval">...</pyval> wrapping element
  from the output of the PyvalColorizer.

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/markup/pyval_repr.py
    trunk/epydoc/src/epydoc/test/pyval_repr.doctest

Modified: trunk/epydoc/src/epydoc/markup/pyval_repr.py
===================================================================

--- trunk/epydoc/src/epydoc/markup/pyval_repr.py	2007-02-13 08:17:33 UTC (rev 1466)
+++ trunk/epydoc/src/epydoc/markup/pyval_repr.py	2007-02-13 08:21:20 UTC (rev 1467)
@@ -136,8 +136,7 @@
         except _Maxlines:
             state.result.append(self.ELLIPSIS)
         # Put it all together.
-        tree = Element('epytext', Element('code', style='pyval',
-                                          *state.result))
+        tree = Element('epytext', *state.result)
         return ParsedEpytextDocstring(tree), state.score
 
     def _colorize(self, pyval, state):

Modified: trunk/epydoc/src/epydoc/test/pyval_repr.doctest
===================================================================
--- trunk/epydoc/src/epydoc/test/pyval_repr.doctest	2007-02-13 08:17:33 UTC (rev 1466)
+++ trunk/epydoc/src/epydoc/test/pyval_repr.doctest	2007-02-13 08:21:20 UTC (rev 1467)
@@ -11,22 +11,22 @@
 with no syntax highlighting:
 
     >>> color(10)
-    <code class="pyval">10</code>
+    10
     >>> color(1./4)
-    <code class="pyval">0.25</code>
+    0.25
     >>> color(None)
-    <code class="pyval">None</code>
+    None
     >>> color(100)
-    <code class="pyval">100</code>
+    100
 
 Long ints will get wrapped if they're big enough:
     
     >>> color(10000000)
-    <code class="pyval">10000000</code>
+    10000000
     >>> color(10**90)
-    <code class="pyval">1000000000000000000000000000000000000000&crarr;
+    1000000000000000000000000000000000000000&crarr;
     0000000000000000000000000000000000000000&crarr;
-    00000000000</code>
+    00000000000
     >>> print '-'*40+'\n'+colorizer.colorize(10**90).to_plaintext(None)
     ----------------------------------------
     1000000000000000000000000000000000000000\
@@ -39,37 +39,37 @@
 escaped using the 'string-escape' encoding.  
 
     >>> color(''.join(chr(i) for i in range(256)))
-    <code class="pyval"><code class="val-quote">'''</code><code class="val-string">\x00\x01\x02\x03\x04\x05\x06\x07\x08\</code>&crarr;
+    <code class="val-quote">'''</code><code class="val-string">\x00\x01\x02\x03\x04\x05\x06\x07\x08\</code>&crarr;
     <code class="val-string">t</code>
     <code class="val-string">\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x</code>&crarr;
     <code class="val-string">15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x</code>&crarr;
     <code class="val-string">1f !&quot;#$%&amp;\'()*+,-./0123456789:;&lt;=&gt;?@ABCD</code>&crarr;
-    <code class="ellipsis">...</code></code>
+    <code class="ellipsis">...</code>
     
 Currently, the "'" quote is always used, because that's what the
 'string-escape' encoding expects.
 
     >>> color('Hello')
-    <code class="pyval"><code class="val-quote">'</code><code class="val-string">Hello</code><code class="val-quote">'</code></code>
+    <code class="val-quote">'</code><code class="val-string">Hello</code><code class="val-quote">'</code>
     >>> color('"Hello"')
-    <code class="pyval"><code class="val-quote">'</code><code class="val-string">&quot;Hello&quot;</code><code class="val-quote">'</code></code>
+    <code class="val-quote">'</code><code class="val-string">&quot;Hello&quot;</code><code class="val-quote">'</code>
     >>> color("'Hello'")
-    <code class="pyval"><code class="val-quote">'</code><code class="val-string">\'Hello\'</code><code class="val-quote">'</code></code>
+    <code class="val-quote">'</code><code class="val-string">\'Hello\'</code><code class="val-quote">'</code>
 
 Strings containing newlines are automatically rendered as multiline
 strings.
 
     >>> color("This\n  is a multiline\n string!")
-    <code class="pyval"><code class="val-quote">'''</code><code class="val-string">This</code>
+    <code class="val-quote">'''</code><code class="val-string">This</code>
     <code class="val-string">  is a multiline</code>
-    <code class="val-string"> string!</code><code class="val-quote">'''</code></code>
+    <code class="val-string"> string!</code><code class="val-quote">'''</code>
 
 Unicode strings are handled properly.
 
     >>> color(u"Hello world")
-    <code class="pyval"><code class="val-quote">u'</code><code class="val-string">Hello world</code><code class="val-quote">'</code></code>
+    <code class="val-quote">u'</code><code class="val-string">Hello world</code><code class="val-quote">'</code>
     >>> color(u"\uaaaa And \ubbbb")
-    <code class="pyval"><code class="val-quote">u'</code><code class="val-string">\uaaaa And \ubbbb</code><code class="val-quote">'</code></code>
+    <code class="val-quote">u'</code><code class="val-string">\uaaaa And \ubbbb</code><code class="val-quote">'</code>
 
 Lists, Tuples, etc.
 ===================
@@ -79,28 +79,28 @@
 listed on a separate line, indented by the size of the open-bracket.
     
     >>> color(range(10))
-    <code class="pyval"><code class="val-group">[</code>0<code class="val-op">, </code>1<code class="val-op">, </code>2<code class="val-op">, </code>3<code class="val-op">, </code>4<code class="val-op">, </code>5<code class="val-op">, </code>6<code class="val-op">, </code>7<code class="val-op">, </code>8<code class="val-op">, </code>9<code class="val-group">]</code></code>
+    <code class="val-group">[</code>0<code class="val-op">, </code>1<code class="val-op">, </code>2<code class="val-op">, </code>3<code class="val-op">, </code>4<code class="val-op">, </code>5<code class="val-op">, </code>6<code class="val-op">, </code>7<code class="val-op">, </code>8<code class="val-op">, </code>9<code class="val-group">]</code>
     >>> color(range(100))
-    <code class="pyval"><code class="val-group">[</code>0<code class="val-op">,</code>
+    <code class="val-group">[</code>0<code class="val-op">,</code>
      1<code class="val-op">,</code>
      2<code class="val-op">,</code>
      3<code class="val-op">,</code>
      4<code class="val-op">,</code>
-    <code class="ellipsis">...</code></code>
+    <code class="ellipsis">...</code>
     >>> color([1,2,[5,6,[(11,22,33),9],10],11]+[99,98,97,96,95])
-    <code class="pyval"><code class="val-group">[</code>1<code class="val-op">,</code>
+    <code class="val-group">[</code>1<code class="val-op">,</code>
      2<code class="val-op">,</code>
      <code class="val-group">[</code>5<code class="val-op">, </code>6<code class="val-op">, </code><code class="val-group">[</code><code class="val-group">(</code>11<code class="val-op">, </code>22<code class="val-op">, </code>33<code class="val-group">)</code><code class="val-op">, </code>9<code class="val-group">]</code><code class="val-op">, </code>10<code class="val-group">]</code><code class="val-op">,</code>
      11<code class="val-op">,</code>
      99<code class="val-op">,</code>
-    <code class="ellipsis">...</code></code>
+    <code class="ellipsis">...</code>
     >>> color(set(range(20)))
-    <code class="pyval"><code class="val-group">set([</code>0<code class="val-op">,</code>
+    <code class="val-group">set([</code>0<code class="val-op">,</code>
          1<code class="val-op">,</code>
          2<code class="val-op">,</code>
          3<code class="val-op">,</code>
          4<code class="val-op">,</code>
-    <code class="ellipsis">...</code></code>
+    <code class="ellipsis">...</code>
 
 Dictionaries
 ============
@@ -108,12 +108,12 @@
 "op".
 
     >>> color({1:33, 2:[1,2,3,{7:'oo'*20}]})
-    <code class="pyval"><code class="val-group">{</code>1<code class="val-op">: </code>33<code class="val-op">,</code>
+    <code class="val-group">{</code>1<code class="val-op">: </code>33<code class="val-op">,</code>
      2<code class="val-op">: </code><code class="val-group">[</code>1<code class="val-op">,</code>
          2<code class="val-op">,</code>
          3<code class="val-op">,</code>
          <code class="val-group">{</code>7<code class="val-op">: </code><code class="val-quote">'</code><code class="val-string">oooooooooooooooooooooooooooooo</code>&crarr; 
-    <code class="ellipsis">...</code></code>
+    <code class="ellipsis">...</code>
 
 Regular Expressions
 ===================
@@ -131,67 +131,67 @@
 
     >>> # Literal characters
     >>> color_re(u'abc \t\r\n\f\v \xff \uffff \U000fffff', False)
-    <code class="pyval">abc \t\r\n\f\v \xff \uffff \U000fffff</code>
+    abc \t\r\n\f\v \xff \uffff \U000fffff
     >>> color_re(r'\.\^\$\\\*\+\?\{\}\[\]\|\(\)')
-    <code class="pyval">\.\^\$\\\*\+\?\{\}\[\]\|\(\)</code>
+    \.\^\$\\\*\+\?\{\}\[\]\|\(\)
 
     >>> # Any character & character classes
     >>> color_re(r".\d\D\s\S\w\W\A^$\b\B\Z")
-    <code class="pyval">.\d\D\s\S\w\W\A^$\b\B\Z</code>
+    .\d\D\s\S\w\W\A^$\b\B\Z
 
     >>> # Branching
     >>> color_re(r"foo|bar")
-    <code class="pyval">foo<code class="re-op">|</code>bar</code>
+    foo<code class="re-op">|</code>bar
 
     >>> # Character classes
     >>> color_re(r"[abcd]")
-    <code class="pyval"><code class="re-group">[</code>abcd<code class="re-group">]</code></code>
+    <code class="re-group">[</code>abcd<code class="re-group">]</code>
 
     >>> # Repeats
     >>> color_re(r"a*b+c{4,}d{,5}e{3,9}f?")
-    <code class="pyval">a<code class="re-op">*</code>b<code class="re-op">+</code>c<code class="re-op">{4,}</code>d<code class="re-op">{,5}</code>e<code class="re-op">{3,9}</code>f<code class="re-op">?</code></code>
+    a<code class="re-op">*</code>b<code class="re-op">+</code>c<code class="re-op">{4,}</code>d<code class="re-op">{,5}</code>e<code class="re-op">{3,9}</code>f<code class="re-op">?</code>
     >>> color_re(r"a*?b+?c{4,}?d{,5}?e{3,9}?f??")
-    <code class="pyval">a<code class="re-op">*?</code>b<code class="re-op">+?</code>c<code class="re-op">{4,}?</code>d<code class="re-op">{,5}?</code>e<code class="re-op">{3,9}?</code>f<code class="re-op">??</code></code>
+    a<code class="re-op">*?</code>b<code class="re-op">+?</code>c<code class="re-op">{4,}?</code>d<code class="re-op">{,5}?</code>e<code class="re-op">{3,9}?</code>f<code class="re-op">??</code>
     
     >>> # Subpatterns
     >>> color_re(r"(foo (bar) | (baz))")
-    <code class="pyval"><code class="re-group">(</code>foo <code class="re-group">(</code>bar<code class="re-group">)</code> <code class="re-op">|</code> <code class="re-group">(</code>baz<code class="re-group">)</code><code class="re-group">)</code></code>
+    <code class="re-group">(</code>foo <code class="re-group">(</code>bar<code class="re-group">)</code> <code class="re-op">|</code> <code class="re-group">(</code>baz<code class="re-group">)</code><code class="re-group">)</code>
     >>> color_re(r"(?:foo (?:bar) | (?:baz))")
-    <code class="pyval"><code class="re-group">(?:</code>foo <code class="re-group">(?:</code>bar<code class="re-group">)</code> <code class="re-op">|</code> <code class="re-group">(?:</code>baz<code class="re-group">)</code><code class="re-group">)</code></code>
+    <code class="re-group">(?:</code>foo <code class="re-group">(?:</code>bar<code class="re-group">)</code> <code class="re-op">|</code> <code class="re-group">(?:</code>baz<code class="re-group">)</code><code class="re-group">)</code>
     >>> color_re("(foo (?P<a>bar) | (?P<boop>baz))")
-    <code class="pyval"><code class="re-group">(</code>foo <code class="re-group">(?P&lt;</code><code class="re-ref">a</code><code class="re-group">&gt;</code>bar<code class="re-group">)</code> <code class="re-op">|</code> <code class="re-group">(?P&lt;</code><code class="re-ref">boop</code><code class="re-group">&gt;</code>baz<code class="re-group">)</code><code class="re-group">)</code></code>
+    <code class="re-group">(</code>foo <code class="re-group">(?P&lt;</code><code class="re-ref">a</code><code class="re-group">&gt;</code>bar<code class="re-group">)</code> <code class="re-op">|</code> <code class="re-group">(?P&lt;</code><code class="re-ref">boop</code><code class="re-group">&gt;</code>baz<code class="re-group">)</code><code class="re-group">)</code>
 
     >>> # Group References
     >>> color_re(r"(...) and (\1)")
-    <code class="pyval"><code class="re-group">(</code>...<code class="re-group">)</code> and <code class="re-group">(</code><code class="re-ref">\1</code><code class="re-group">)</code></code>
+    <code class="re-group">(</code>...<code class="re-group">)</code> and <code class="re-group">(</code><code class="re-ref">\1</code><code class="re-group">)</code>
 
     >>> # Ranges
     >>> color_re(r"[a-bp-z]")
-    <code class="pyval"><code class="re-group">[</code>a<code class="re-op">-</code>bp<code class="re-op">-</code>z<code class="re-group">]</code></code>
+    <code class="re-group">[</code>a<code class="re-op">-</code>bp<code class="re-op">-</code>z<code class="re-group">]</code>
     >>> color_re(r"[^a-bp-z]")
-    <code class="pyval"><code class="re-group">[</code><code class="re-op">^</code>a<code class="re-op">-</code>bp<code class="re-op">-</code>z<code class="re-group">]</code></code>
+    <code class="re-group">[</code><code class="re-op">^</code>a<code class="re-op">-</code>bp<code class="re-op">-</code>z<code class="re-group">]</code>
     >>> color_re(r"[^abc]")
-    <code class="pyval"><code class="re-group">[</code><code class="re-op">^</code>abc<code class="re-group">]</code></code>
+    <code class="re-group">[</code><code class="re-op">^</code>abc<code class="re-group">]</code>
 
     >>> # Lookahead/behinds
     >>> color_re(r"foo(?=bar)")
-    <code class="pyval">foo<code class="re-group">(?=</code>bar<code class="re-group">)</code></code>
+    foo<code class="re-group">(?=</code>bar<code class="re-group">)</code>
     >>> color_re(r"foo(?!bar)")
-    <code class="pyval">foo<code class="re-group">(?!</code>bar<code class="re-group">)</code></code>
+    foo<code class="re-group">(?!</code>bar<code class="re-group">)</code>
     >>> color_re(r"(?<=bar)foo")
-    <code class="pyval"><code class="re-group">(?&lt;=</code>bar<code class="re-group">)</code>foo</code>
+    <code class="re-group">(?&lt;=</code>bar<code class="re-group">)</code>foo
     >>> color_re(r"(?<!bar)foo")
-    <code class="pyval"><code class="re-group">(?&lt;!</code>bar<code class="re-group">)</code>foo</code>
+    <code class="re-group">(?&lt;!</code>bar<code class="re-group">)</code>foo
 
     >>> # Flags
     >>> color_re(r"(?im)^Food")
-    <code class="pyval"><code class="re-flags">(?im)</code>^Food</code>
+    <code class="re-flags">(?im)</code>^Food
     >>> color_re(r"(?Limsx)^Food")
-    <code class="pyval"><code class="re-flags">(?Limsx)</code>^Food</code>
+    <code class="re-flags">(?Limsx)</code>^Food
     >>> color_re(r"(?Limstux)^Food")
-    <code class="pyval"><code class="re-flags">(?Limstux)</code>^Food</code>
+    <code class="re-flags">(?Limstux)</code>^Food
     >>> color_re(r"(?x)This   is   verbose", False)
-    <code class="pyval"><code class="re-flags">(?x)</code>Thisisverbose</code>
+    <code class="re-flags">(?x)</code>Thisisverbose
 
 Representation Scores
 =====================


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


