[Python-checkins] r54230 - python/trunk/Lib/difflib.py

Thu Mar 8 22:33:50 CET 2007

Author: raymond.hettinger
Date: Thu Mar 8 22:33:47 2007
New Revision: 54230
Modified:
 python/trunk/Lib/difflib.py
Log:
SF #1637850: make_table in difflib did not work with unicode
Modified: python/trunk/Lib/difflib.py
==============================================================================

--- python/trunk/Lib/difflib.py	(original)
+++ python/trunk/Lib/difflib.py	Thu Mar 8 22:33:47 2007
@@ -1945,8 +1945,7 @@
 fromlist,tolist,flaglist,next_href,next_id = self._convert_flags(
 fromlist,tolist,flaglist,context,numlines)
 
- import cStringIO
- s = cStringIO.StringIO()
+ s = []
 fmt = ' <tr><td class="diff_next"%s>%s</td>%s' + \
 '<td class="diff_next">%s</td>%s</tr>\n'
 for i in range(len(flaglist)):
@@ -1954,9 +1953,9 @@
 # mdiff yields None on separator lines skip the bogus ones
 # generated for the first line
 if i > 0:
- s.write(' </tbody> \n <tbody>\n')
+ s.append(' </tbody> \n <tbody>\n')
 else:
- s.write( fmt % (next_id[i],next_href[i],fromlist[i],
+ s.append( fmt % (next_id[i],next_href[i],fromlist[i],
 next_href[i],tolist[i]))
 if fromdesc or todesc:
 header_row = '<thead><tr>%s%s%s%s</tr></thead>' % (
@@ -1968,7 +1967,7 @@
 header_row = ''
 
 table = self._table_template % dict(
- data_rows=s.getvalue(),
+ data_rows=''.join(s),
 header_row=header_row,
 prefix=self._prefix[1])
 
