Add support for Python 3

Add support for running under Python 3, while maintaining compatibility
with Python 2.

See http://python-future.org/compatible_idioms.html for more details
behind these changes.

1 files changed, 5 insertions, 4 deletions

diff --git a/wa/output_processors/csvproc.py b/wa/output_processors/csvproc.py
index 9a90006e..8d7f6887 100644
--- a/wa/output_processors/csvproc.py
+++ b/wa/output_processors/csvproc.py
@@ -1,4 +1,6 @@
-import csv
+import sys
+
+from devlib.utils.csvutil import csvwriter
 
 from wa import OutputProcessor, Parameter
 from wa.framework.exception import ConfigError
@@ -64,7 +66,7 @@ class CsvReportProcessor(OutputProcessor):
             classifiers = set([])
             for out in outputs:
                 for metric in out.metrics:
-                    classifiers.update(metric.classifiers.keys())
+                    classifiers.update(list(metric.classifiers.keys()))
             extra_columns = list(classifiers)
         elif self.extra_columns:
             extra_columns = self.extra_columns
@@ -72,8 +74,7 @@ class CsvReportProcessor(OutputProcessor):
             extra_columns = []
 
         outfile = output.get_path('results.csv')
-        with open(outfile, 'wb') as wfh:
-            writer = csv.writer(wfh)
+        with csvwriter(outfile) as writer:
             writer.writerow(['id', 'workload', 'iteration', 'metric', ] +
                             extra_columns + ['value', 'units'])