diff options
author | Tianjie Xu <xunchang@google.com> | 2020-07-06 22:00:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 22:00:00 +0000 |
commit | 557e01c63a399862c27effe01ec99912a8bbf262 (patch) | |
tree | 76401c6ad9d53febb8fc4cc23ea0ddec7ca802c7 /scripts/update_payload/format_utils_unittest.py | |
parent | 8a894b1100277a11b1cbffc7f3c5b1598f24aeb3 (diff) | |
parent | 4e18ea41094a9bc4e3eb821196d6d0aae6abb2b4 (diff) |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge" am: 242e33af30 am: 4e18ea4109
Original change: undetermined
Change-Id: I0e7ea7811da78d58fbeac26f555b5436a64be97b
Diffstat (limited to 'scripts/update_payload/format_utils_unittest.py')
-rwxr-xr-x | scripts/update_payload/format_utils_unittest.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/update_payload/format_utils_unittest.py b/scripts/update_payload/format_utils_unittest.py index 42ea621c..4dcd6527 100755 --- a/scripts/update_payload/format_utils_unittest.py +++ b/scripts/update_payload/format_utils_unittest.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # # Copyright (C) 2013 The Android Open Source Project # @@ -17,6 +17,11 @@ """Unit tests for format_utils.py.""" +# Disable check for function names to avoid errors based on old code +# pylint: disable-msg=invalid-name + +from __future__ import absolute_import + import unittest from update_payload import format_utils |