diff options
| author | Hridya Valsaraju <hridya@google.com> | 2020-08-31 18:19:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-31 18:19:05 +0000 |
| commit | 56d38dd4727f4165b7ee63e2bf882d537d6bf859 (patch) | |
| tree | 14c5a82d173625e86ec88f29f335233e740daf8e | |
| parent | ea9181bd587273b27d85772b0b93ed2c58de9091 (diff) | |
| parent | da46bb9ac061ff6757c9c8e369cfd92c6df877a1 (diff) | |
| download | libufdt-56d38dd4727f4165b7ee63e2bf882d537d6bf859.tar.gz | |
Make mkdtboimg.py compatible with python3 am: 2293727663 am: f5e4d426c1 am: 415d01437a am: 1f9e009223 am: da46bb9ac0
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1415228
Change-Id: I784940cd02144059bd651ead9e3c3d328a06f577
| -rwxr-xr-x | utils/src/mkdtboimg.py | 12 |
1 files changed, 6 insertions, 6 deletions
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, |