[Erp5-report] r7191 - /erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

[nobody at svn.erp5.org]

Author: chris
Date: Thu May 11 13:11:07 2006
New Revision: 7191

URL: http://svn.erp5.org?rev=7191&view=rev
Log:
- do not duplicate escape function anymore, use the one in xml.sax.saxutils

Modified:
    erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=7191&r1=7190&r2=7191&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Thu May 11 13:11:07 2006
@@ -47,6 +47,7 @@
 from zLOG import LOG
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5.Document.BusinessTemplate import removeAll
+from xml.sax.saxutils import escape
 
 
 try:
@@ -172,18 +173,6 @@
           tmp.append(line)
     self.children.append(CodeBlock(os.linesep.join(tmp)))
     
-
-  def _escape(self, data):
-    """
-      Escape &, <, and > in a string of data.
-      This is a copy of the xml.sax.saxutils.escape function.
-    """
-    if data:
-      #data = data.replace("&", "&amp;")
-      data = data.replace(">", "&gt;")
-      data = data.replace("<", "&lt;")
-      return data
-    
   def toHTML(self):
     # Adding header of the table
     if self.binary:
@@ -219,7 +208,7 @@
         <td style="background-color: %s">%s</td>
         <td style="background-color: black;" width="2"></td>
         <td style="background-color: %s">%s</td>
-        </tr>'''%(old_line_tuple[1], self._escape(old_line).replace(' ', '&nbsp;').replace('\t', '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'), new_line_tuple[1], self._escape(new_line).replace(' ', '&nbsp;').replace('\t', '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'))
+        </tr>'''%(old_line_tuple[1], escape(old_line).replace(' ', '&nbsp;').replace('\t', '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'), new_line_tuple[1], escape(new_line).replace(' ', '&nbsp;').replace('\t', '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'))
     html += '''  </tbody>
 </table><br><br>'''
     return html