From 7a6f9fb238e4a1a4a9533823db2618e2cd416f1e Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Thu, 30 Aug 2012 00:10:57 +0200 Subject: [PATCH 1/1] use 2 streams (input and output) instead of 1 in parse_from_memory() The initial code was not well tested and according to Sergey it is not working properly. Signed-off-by: Sergey Satskiy Signed-off-by: Olivier Matz --- diff2html.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/diff2html.py b/diff2html.py index 337667f..b361491 100644 --- a/diff2html.py +++ b/diff2html.py @@ -424,9 +424,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() -- 2.20.1