From: Olivier Matz <olivier.matz@6wind.com>
Date: Fri, 15 Jun 2012 13:36:25 +0000 (+0200)
Subject: allow to be called with strings instead of IO files
X-Git-Tag: v1.0~7
X-Git-Url: http://git.droids-corp.org/?p=diff2html.git;a=commitdiff_plain;h=dd0649dbd5ba5463535a8a2cb4c2335a78e4fec6;hp=cae8dca768d5fc7aeb960322130fe95121000bb4

allow to be called with strings instead of IO files

Signed-off-by: Sergey Satskiy <sergey.satskiy@gmail.com>
Signed-off-by: Olivier Matz <zer0@droids-corp.org>
---

diff --git a/diff2html.py b/diff2html.py
index d573d8f..337667f 100644
--- a/diff2html.py
+++ b/diff2html.py
@@ -33,7 +33,7 @@
 #   and display those directly.
 
 
-import sys, re, htmlentitydefs, getopt
+import sys, re, htmlentitydefs, getopt, StringIO
 
 # minimum line size, we add a zero-sized breakable space every
 # LINESIZE characters
@@ -422,6 +422,11 @@ def main():
     parse_input(input_file, output_file,
                 exclude_headers, show_hunk_infos)
 
+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
 
 if __name__ == "__main__":
     main()