diff options
author | Tianjie Xu <xunchang@google.com> | 2020-07-06 22:16:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 22:16:10 +0000 |
commit | 6d7c31ca10907788e6420c086af5c4342d0ba423 (patch) | |
tree | 76401c6ad9d53febb8fc4cc23ea0ddec7ca802c7 /scripts/update_payload/format_utils_unittest.py | |
parent | da40ffb3f39d7060f6e75288f3e625f43c96c082 (diff) | |
parent | 557e01c63a399862c27effe01ec99912a8bbf262 (diff) |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge" am: 242e33af30 am: 4e18ea4109 am: 557e01c63a
Original change: undetermined
Change-Id: I1394bcd4d50e47c0186119204d2adfbf3e711313
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 |