[Libreoffice-commits] dev-tools.git: test-bugzilla-files/analyze-logs.py

[Christian Lohmaier]

 test-bugzilla-files/analyze-logs.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit bc0aabc6e6fc8880a1e2d7979411b0ebd9d2ee91
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Mar 6 13:53:19 2015 +0100

    don't overwrite a file we're still reading from
    
    slurp in the inputfile to avoid this
    also use sorted output to allow for easier comparison and use the
    writer's default value instead of assigning 0 manually

diff --git a/test-bugzilla-files/analyze-logs.py b/test-bugzilla-files/analyze-logs.py
index 8cae85b..b52dcb1 100644
--- a/test-bugzilla-files/analyze-logs.py
+++ b/test-bugzilla-files/analyze-logs.py
@@ -65,17 +65,17 @@ def get_directories():
 def import_csv(filename):
     if not os.path.exists(filename):
         return None
-    reader = csv.DictReader(open(filename))
+    infile = open(filename,'r')
+    reader = csv.DictReader(infile.readlines())
+    infile.close()
     return reader
 
 def export_csv(filename, data, reader):
     fieldnames = set(data.keys())
-    for entry in set(reader.fieldnames).difference(data.iterkeys()):
-        data[entry] = 0
 
     if not reader is None:
-        fieldnames |= set(reader.fieldnames)
-    writer = csv.DictWriter(open(filename, "w"), fieldnames)
+        fieldnames.update(reader.fieldnames)
+    writer = csv.DictWriter(open(filename, "w"), sorted(fieldnames), restval=0)
     writer.writeheader()
     if not reader is None:
         for row in reader: