Mercurial > cpython-lru_cache-weakref
diff Lib/difflib.py @ 41078:f2ba812f7200 legacy-trunk
SF #1637850: make_table in difflib did not work with unicode
| author | Raymond Hettinger <python@rcn.com> |
|---|---|
| date | Thu, 08 Mar 2007 21:33:47 +0000 |
| parents | 7f76996c7bf4 |
| children | 6b0b5edfb1b7 |
line wrap: on
line diff
--- a/Lib/difflib.py Thu Mar 08 19:58:14 2007 +0000 +++ b/Lib/difflib.py Thu Mar 08 21:33:47 2007 +0000 @@ -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])