mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools/misc/xencov_split: Add python 3 compatibility
Resolves: xen-project/xen#154 Signed-off-by: Javi Merino <javi.merino@cloud.com> Acked-by: Anthony PERARD <anthony.perard@citrix.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
This commit is contained in:
1 parent
35949b8c58
commit
3e73dd889d
1 file changed
+9
-6
@@ -1,5 +1,7 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
from __future__ import print_function
|
||||
from builtins import str
|
||||
import sys, os, os.path as path, struct, errno
|
||||
from optparse import OptionParser
|
||||
|
||||
@@ -16,7 +18,7 @@ def xencov_split(opts):
|
||||
|
||||
input_file = opts.args[0]
|
||||
|
||||
f = open(input_file)
|
||||
f = open(input_file, "rb")
|
||||
|
||||
# Magic number
|
||||
s = f.read(4)
|
||||
@@ -31,9 +33,10 @@ def xencov_split(opts):
|
||||
f.close()
|
||||
|
||||
while content:
|
||||
off = content.find('\x00')
|
||||
off = content.find(b'\x00')
|
||||
fmt = bo_prefix + str(off) + 's'
|
||||
fn, = struct.unpack_from(fmt, content)
|
||||
fn = fn.decode('utf-8')
|
||||
content = content[off+1:]
|
||||
|
||||
fmt = bo_prefix + 'I'
|
||||
@@ -51,14 +54,14 @@ def xencov_split(opts):
|
||||
dir = opts.output_dir + path.dirname(fn)
|
||||
try:
|
||||
os.makedirs(dir)
|
||||
except OSError, e:
|
||||
except OSError as e:
|
||||
if e.errno == errno.EEXIST and os.path.isdir(dir):
|
||||
pass
|
||||
else:
|
||||
raise
|
||||
|
||||
full_path = dir + '/' + path.basename(fn)
|
||||
f = open(full_path, "w")
|
||||
f = open(full_path, "wb")
|
||||
f.write(payload)
|
||||
f.close()
|
||||
|
||||
@@ -89,8 +92,8 @@ def main():
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
sys.exit(main())
|
||||
except Exception, e:
|
||||
print >>sys.stderr, "Error:", e
|
||||
except Exception as e:
|
||||
print("Error:", e, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
except KeyboardInterrupt:
|
||||
sys.exit(1)
|
||||