From 22937276636e16eadf8c3eb843077bde612d45de Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Fri, 28 Aug 2020 15:11:13 -0700 Subject: Make mkdtboimg.py compatible with python3 There are a few changes needed to run mkdtboimg.py with python3. -No more implicit conversion between char and byte. -xrange was renamed to range in python3 -floor division must be done with the '//' operator Bug: 166496956 Test: ./mkdtboimg_testdata.sh Test: atest FirmwareDtboVerification Change-Id: I8b9b97b7b9f31768cc133f37d0144420cb1a0e81 --- utils/src/mkdtboimg.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'utils/src/mkdtboimg.py') diff --git a/utils/src/mkdtboimg.py b/utils/src/mkdtboimg.py index 5f1b607..056fb11 100755 --- a/utils/src/mkdtboimg.py +++ b/utils/src/mkdtboimg.py @@ -274,7 +274,7 @@ class Dtbo(object): Tree table entries and update the DTBO header. """ - self.__metadata = array('c', ' ' * self.__metadata_size) + self.__metadata = array('b', b' ' * self.__metadata_size) metadata_offset = self.header_size for dt_entry in self.__dt_entries: self._update_dt_entry_header(dt_entry, metadata_offset) @@ -320,7 +320,7 @@ class Dtbo(object): if self.__dt_entries: raise ValueError('DTBO DT entries can be added only once') - offset = self.dt_entries_offset / 4 + offset = self.dt_entries_offset // 4 params = {} params['version'] = self.version params['dt_file'] = None @@ -501,7 +501,7 @@ class Dtbo(object): dt_offset = (self.header_size + dt_entry_count * self.dt_entry_size) - dt_entry_buf = "" + dt_entry_buf = b"" for dt_entry in dt_entries: if not isinstance(dt_entry, DtEntry): raise ValueError('Adding invalid DT entry object to DTBO') @@ -650,7 +650,7 @@ def parse_dt_entries(global_args, arg_list): raise ValueError('Input DT images must be provided') total_images = len(img_file_idx) - for idx in xrange(total_images): + for idx in range(total_images): start_idx = img_file_idx[idx] if idx == total_images - 1: argv = arg_list[start_idx:] @@ -810,7 +810,7 @@ def parse_dump_cmd_args(arglist): parser = argparse.ArgumentParser(prog='dump') parser.add_argument('--output', '-o', nargs='?', - type=argparse.FileType('wb'), + type=argparse.FileType('w'), dest='outfile', default=stdout) parser.add_argument('--dtb', '-b', nargs='?', type=str, @@ -830,7 +830,7 @@ def parse_config_create_cmd_args(arglist): """ parser = argparse.ArgumentParser(prog='cfg_create') parser.add_argument('conf_file', nargs='?', - type=argparse.FileType('rb'), + type=argparse.FileType('r'), default=None) cwd = os.getcwd() parser.add_argument('--dtb-dir', '-d', nargs='?', type=str, -- cgit v1.2.3