test_framework: Support python3 in expand_testcase

Use open() instead of file() and add encode() calls to handle byte conversion.
iovisor · Feb 25, 2021 · 0014f29 · 0014f29
1 parent 7c1437c
commit 0014f29
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/test_framework/expand-testcase.py b/test_framework/expand-testcase.py
@@ -29,7 +29,7 @@ def main():
         os.makedirs(args.path)
 
     def writefile(name, contents):
-        file("%s/%s" % (args.path, name), "w").write(contents)
+        open("%s/%s" % (args.path, name), "wb").write(contents)
 
     if 'mem' in data:
         writefile('mem', data['mem'])
@@ -49,7 +49,7 @@ def writefile(name, contents):
             + data['mem'])
 
     if 'raw' in data:
-        code = ''.join(struct.pack("=Q", x) for x in data['raw'])
+        code = b''.join(struct.pack("=Q", x) for x in data['raw'])
     elif 'asm' in data:
         code = ubpf.assembler.assemble(data['asm'])
     else:
@@ -59,7 +59,7 @@ def writefile(name, contents):
         writefile('code', code)
 
     if 'asm' in data:
-        writefile('asm', data['asm'])
+        writefile('asm', data['asm'].encode())
     elif code:
         writefile('asm', ubpf.disassembler.disassemble(code))