[LNT] Python 3 support: adapt csv reader open

[thopre]

Summary

csv.reader have different expectation between Python versions regarding
the file object it reads from. On Python 2 it requires the file to have
been opened in binary mode while on Python 3 it requires text mode and
universal newlines mode enabled but forwarded untranslated to the
caller. This commit use an if to cater to both requirements.

[PrzemekWirkus]

lnt/tests/nt.py

774–777

Can you verify that you should rather use mode == 'U' for universal mode?

https://docs.python.org/release/3.2/library/functions.html#open

See table below the Python 3 open function instead of newline == ''.

I'm not an expert in this area.

[PrzemekWirkus]

lnt/tests/nt.py

774–777

I need to clarify:

I was wondering if we should combine mode == 'rU' with newline=='' or not.

[PrzemekWirkus]

lnt/tests/nt.py

774–777

My thinking is that when you use Universal mode "rU" you will get all newlines -> '\n'. Would that be enough you think?

[PrzemekWirkus]

lnt/tests/nt.py

774–777

report_file = open(report_path, 'ru')

Should be enough I guess. Are you able to verify this on your end ?

774–777

s/u/U/

report_file = open(report_path, 'rU')

[thopre]

lnt/tests/nt.py

774–777

It works on my testing but I'm not too keen on using rU since the doc you linked says specifically it's for compatibility and should not be used in new code. My goal in this Python 3 conversion is to follow the Python 3 codestyle/idioms.

[PrzemekWirkus]

LGTM

You've defended your code ;)

[thopre]

Committed as 8ff573aa093146e44efd5bdb36f8bb8658a984f2

lnt/tests/nt.py

else:
         if config.test_llc:
             append_to_sample_keys((True, 'llc.exec', 'LLC', 'time'))
         if config.test_llcbeta:
             append_to_sample_keys((True, 'llc-beta.exec', 'LLC-BETA', 'time'))
         if config.test_jit:
             append_to_sample_keys((True, 'jit.exec', 'JIT', 'time'))
 
     # Load the report file.
+    if sys.version_info[0] < 3:
         report_file = open(report_path, 'rb')
+    else:
+        report_file = open(report_path, 'r', newline='')
     reader_it = iter(csv.reader(report_file))
 
     # Get the header.
     header = next(reader_it)
     if header[0] != 'Program':
         fatal('unexpected report file, missing header')
 
     # Verify we have the keys we expect.