X-Git-Url: http://git.droids-corp.org/?p=diff2html.git;a=blobdiff_plain;f=diff2html.py;h=3e527000af39a89d9003b35e5579b4584b909d67;hp=337667faadfec6247fb4e14b4736cc3867e8b73a;hb=ea5aa9e8645cddd7aa8dce57e0506f5e2f1387ed;hpb=dd0649dbd5ba5463535a8a2cb4c2335a78e4fec6

diff --git a/diff2html.py b/diff2html.py
index 337667f..3e52700 100644
--- a/diff2html.py
+++ b/diff2html.py
@@ -106,7 +106,6 @@ def linediff(s, t):
 
     m, n = len(s), len(t)
     d = [[(0, 0) for i in range(n+1)] for i in range(m+1)]
-    x = [[(0, 0) for i in range(n+1)] for i in range(m+1)]
 
 
     d[0][0] = (0, (0, 0))
@@ -424,9 +423,11 @@ def main():
 
 def parse_from_memory(txt, exclude_headers, show_hunk_infos):
     " Parses diff from memory and returns a string with html "
-    stream = StringIO.StringIO(txt)
-    parse_input(stream, stream, exclude_headers, show_hunk_infos)
-    return stream.buf
+    input_stream = StringIO.StringIO(txt)
+    output_stream = StringIO.StringIO()
+    parse_input(input_stream, output_stream, exclude_headers, show_hunk_infos)
+    return output_stream.getvalue()
+
 
 if __name__ == "__main__":
     main()