diff options
| author | Tianjie Xu <xunchang@google.com> | 2020-07-06 21:23:45 +0000 |
|---|---|---|
| committer | Tianjie Xu <xunchang@google.com> | 2020-07-06 21:23:45 +0000 |
| commit | 242e33af30f7aa74531d436e1609100aae3b4394 (patch) | |
| tree | 048c16c3935bac60f150f676ad8f8d8493248ce1 /scripts/blockdiff.py | |
| parent | 33d180914ef2cb9286595fb1fdcc3511c5fb1c34 (diff) | |
| parent | 55abd3cbae6bd150b3534728a63befd1cadd6c5e (diff) | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
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: |