diff options
| author | Andrew Lassalle <andrewlassalle@chromium.org> | 2019-11-05 13:30:34 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-19 20:22:42 +0000 |
| commit | 165843ca10908d7bd79582829a5ee51b098685e6 (patch) | |
| tree | c4c98899ca4d134af1b2655afbe17dc7cb843b40 /scripts/blockdiff.py | |
| parent | d04ca0c5cc9e4507301be355fd3bd86b871b05c4 (diff) | |
update_payload: Port scripts to python3
Update the update_payload scripts to be compatible with
python2 and python3. Python2 compatibility is needed since
the repo is shared with Android.
BUG=chromium:1011631
TEST=Executed aosp/system/update_engine/scripts/run_unittests and
cros_generate_update_payload
Cq-Depend: chromium:1904837, chromium:1911499
Change-Id: Ie450b80b5f7550051b38d320173ccc0c915f65e7
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/1904310
Commit-Queue: Andrew Lassalle <andrewlassalle@chromium.org>
Tested-by: Andrew Lassalle <andrewlassalle@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Auto-Submit: Andrew Lassalle <andrewlassalle@chromium.org>
Diffstat (limited to 'scripts/blockdiff.py')
| -rwxr-xr-x | scripts/blockdiff.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/blockdiff.py b/scripts/blockdiff.py index 5793def7..95893cf4 100755 --- a/scripts/blockdiff.py +++ b/scripts/blockdiff.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # # Copyright (C) 2013 The Android Open Source Project # @@ -17,6 +17,7 @@ """Block diff utility.""" +from __future__ import absolute_import from __future__ import print_function # pylint: disable=import-error @@ -46,7 +47,7 @@ def BlockDiff(block_size, file1, file2, name1, name2, max_length=-1): """ if max_length < 0: - max_length = sys.maxint + max_length = sys.maxsize diff_list = [] num_blocks = extent_start = extent_length = 0 while max_length or extent_length: |