wip

erp5/util/timinglogparser/__init__.py

@@ -254,20 +254,20 @@ if outfile_prefix is not None:
     for sheet_id, sheet_column_list in sheet_dict.iteritems():
       outfile_name = '%s_%s_%s.csv' % (outfile_prefix, sheet_id, filename_suffix)
       print('Writing to %r...' % (outfile_name, ), file=sys.stderr)
-      outfile = open(outfile_name, 'w')
-      print('"date",%s' % (','.join(['"%s"' % (x[0], ) for x in sheet_column_list]), ), file=outfile)
-      decimate_dict = {}
-      decimate = 0
-      for date in date_list:
-        for key, value in line_dict[date].iteritems():
-          decimate_dict.setdefault(key, []).extend(value)
-        decimate += 1
-        if decimate == decimate_count:
+      with open(outfile_name, 'w') as outfile:
+        print('"date",%s' % (','.join(['"%s"' % (x[0], ) for x in sheet_column_list]), ), file=outfile)
+        decimate_dict = {}
+        decimate = 0
+        for date in date_list:
+          for key, value in line_dict[date].iteritems():
+            decimate_dict.setdefault(key, []).extend(value)
+          decimate += 1
+          if decimate == decimate_count:
+            print('"%s",%s' % (date, ','.join([render_cell(decimate_dict.get(x[1], ''), data_format) for x in sheet_column_list])), file=outfile)
+            decimate_dict = {}
+            decimate = 0
+        if len(decimate_dict):
           print('"%s",%s' % (date, ','.join([render_cell(decimate_dict.get(x[1], ''), data_format) for x in sheet_column_list])), file=outfile)
-          decimate_dict = {}
-          decimate = 0
-      if len(decimate_dict):
-        print('"%s",%s' % (date, ','.join([render_cell(decimate_dict.get(x[1], ''), data_format) for x in sheet_column_list])), file=outfile)
 
   if do_average:
     renderOutput('=%(sum)i/%(count)i', 'avg')

erp5/util/webchecker/__init__.py

@@ -617,9 +617,8 @@ def web_checker_utility():
   result = instance.start(prohibited_file_name_list=prohibited_file_name_list,
                        prohibited_folder_name_list=prohibited_folder_name_list)
   if options.output_file:
-    file_object = open(options.output_file, 'w')
-    file_object.write(result)
-    file_object.close()
+    with open(options.output_file, 'w') as file_object:
+      file_object.write(result)
   else:
     print(result)