vndk-def: Fix python2 unittest.
Test: python2 ./tests/run.py
Change-Id: I8c2d9e91652aa9529fc9f3a58e374883626f7dd7
diff --git a/vndk/tools/definition-tool/tests/compat.py b/vndk/tools/definition-tool/tests/compat.py
index 16197fd..f9d83e7 100644
--- a/vndk/tools/definition-tool/tests/compat.py
+++ b/vndk/tools/definition-tool/tests/compat.py
@@ -35,7 +35,7 @@
return
return os.makedirs(path)
-try:
+if sys.version_info >= (3, 0):
from io import StringIO
-except ImportError:
+else:
from StringIO import StringIO
diff --git a/vndk/tools/definition-tool/tests/test_elf.py b/vndk/tools/definition-tool/tests/test_elf.py
index a4dcb45..d8153b5 100755
--- a/vndk/tools/definition-tool/tests/test_elf.py
+++ b/vndk/tools/definition-tool/tests/test_elf.py
@@ -89,9 +89,9 @@
elf = ELF(ELF.ELFCLASS32, ELF.ELFDATA2LSB, 183, ['a'], ['b'],
['libc.so', 'libm.so'], {'hello', 'world'}, {'d', 'e'})
- with StringIO() as f:
- elf.dump(f)
- actual_output = f.getvalue()
+ f = StringIO()
+ elf.dump(f)
+ actual_output = f.getvalue()
self.assertEqual('EI_CLASS\t32\n'
'EI_DATA\t\tLittle-Endian\n'
@@ -110,9 +110,9 @@
elf = ELF(ELF.ELFCLASS32, ELF.ELFDATA2LSB, 183, ['a'], ['b'],
['libc.so', 'libm.so'], {'hello', 'world'})
- with StringIO() as f:
- elf.dump_exported_symbols(f)
- actual_output = f.getvalue()
+ f = StringIO()
+ elf.dump_exported_symbols(f)
+ actual_output = f.getvalue()
self.assertEqual('hello\nworld\n', actual_output)
