[Epydoc-commits] SF.net SVN: epydoc: [1249] trunk/epydoc/src/epydoc/docwriter/html_colorize.py

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

Revision: 1249
Author:   edloper
Date:     2006-08-20 22:53:23 -0700 (Sun, 20 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/epydoc/?rev=1249&view=rev

Log Message:
-----------
- Fixed sf bug #1542936 , where source code colorization would fail
  because doclink targets were added as unicode.

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/docwriter/html_colorize.py
Modified: trunk/epydoc/src/epydoc/docwriter/html_colorize.py
===================================================================
--- trunk/epydoc/src/epydoc/docwriter/html_colorize.py	2006-08-21 05:37:41 UTC (rev 1248)
+++ trunk/epydoc/src/epydoc/docwriter/html_colorize.py	2006-08-21 05:53:23 UTC (rev 1249)
@@ -963,7 +963,6 @@
                     url = url.encode('ascii', 'xmlcharrefreplace')
                 s += ('<a%s%s href="%s">' %
                       (tooltip_html, css_class_html, url))
-                assert type(s) is str # *not* unicode!
             elif css_class_html or tooltip_html:
                 s += '<span%s%s>' % (tooltip_html, css_class_html)
             if i == len(line)-1:
@@ -1011,7 +1010,8 @@
             container = DottedName(self.module_name, *self.context)
         else:
             container = None
-        targets = ['%s=%s' % (self.doc_descr(d,container), self.url_func(d))
+        targets = ['%s=%s' % (str(self.doc_descr(d,container)),
+                              str(self.url_func(d)))
                    for d in docs]
         onclick = ("doclink('%s', '%s', '%s'); return false;" %
                    (uid, name, ','.join(targets)))


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