[LNT] Python 3 support: fix text/binary confusion in profile support

[thopre]

Summary

There is confusion between text and binary in the checkFile method of
the various profile format implementation modules. All of them compare
the first few bytes read in text mode against an expected value.
However, the header of the profile v1 contains some binary data, thus
causing an error in Python 3 when reading a profile v1 file and calling
any of the checkFile method.

This commit changes the checkFile method to read binary data and compare
against binary literals.

[thopre]

Ping?

[hubert.reinterpretcast]

LGTM.

lnt/trunk/lnt/testing/profile/perf.py

 
 
 class LinuxPerfProfile(ProfileImpl):
     def __init__(self):
         pass
 
     @staticmethod
     def checkFile(fn):
-        return open(fn).read(8) == 'PERFILE2'
+        return open(fn, 'rb').read(8) == b'PERFILE2'
 
     @staticmethod
     def deserialize(f, nm='nm', objdump='objdump', propagateExceptions=False):
         f = f.name
 
         if os.path.getsize(f) == 0:
             # Empty file - exit early.
             return None

lnt/trunk/lnt/testing/profile/profilev1impl.py

functions: {
 
     @staticmethod
     def upgrade(old):
         raise RuntimeError("Cannot upgrade to version 1!")
 
     @staticmethod
     def checkFile(fn):
         # "zlib compressed data" - 78 9C
-        return open(fn).read(2) == '\x78\x9c'
+        return open(fn, 'rb').read(2) == b'\x78\x9c'
 
     @staticmethod
     def deserialize(fobj):
         o = zlib.decompress(fobj.read())
         data = cPickle.loads(o)
         return ProfileV1(data)
 
     def serialize(self, fname=None):

lnt/trunk/lnt/testing/profile/profilev2impl.py

def copy(self, counter_name_pool, line_counters,
         return new
 
 
 class ProfileV2(ProfileImpl):
     @staticmethod
     def checkFile(fn):
         # The first number is the version (2); ULEB encoded this is simply
         # 0x02.
-        return ord(open(fn).read(1)) == 2
+        return open(fn, 'rb').read(1) == b'\x02'
 
     @staticmethod
     def deserialize(fobj):
         p = ProfileV2()
 
         p.h = Header()
         p.cnp = CounterNamePool()
         p.tlc = TopLevelCounters(p.cnp)