From adac51ce681152158a4165c6cdf3f58363f2d859 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Fri, 15 Jun 2012 15:02:20 +0200 Subject: [PATCH] cosmetic: replace "type" by "type_name" Indeed "type" is a reserved word: http://pentangle.net/python/handbook/node52.html Signed-off-by: Sergey Satskiy Signed-off-by: Olivier Matz --- diff2html.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/diff2html.py b/diff2html.py index 36d191b..ad6eaee 100644 --- a/diff2html.py +++ b/diff2html.py @@ -229,18 +229,18 @@ def add_line(s1, s2): global line2 if s1==None and s2==None: - type="unmodified" + type_name="unmodified" elif s1==None or s1=="": - type="added" + type_name="added" elif s2==None or s1=="": - type="deleted" + type_name="deleted" elif s1==s2: - type="unmodified" + type_name="unmodified" else: - type="changed" + type_name="changed" s1,s2 = linediff(s1, s2) - outputfile.write(''%type) + outputfile.write(''%type_name) if s1!=None and s1!="": outputfile.write('%d '%line1) outputfile.write('') -- 2.20.1