summaryrefslogtreecommitdiffstats
path: root/tools/releasetools/img_from_target_files.py
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-03-23 19:13:21 -0700
committerDan Albert <danalbert@google.com>2015-03-24 11:05:16 -0700
commit8b72aefb5a8ed4da28c6f83854e8babf53b9cb53 (patch)
tree4f8b55ebd80041d644aaf411adaf8c34696749c5 /tools/releasetools/img_from_target_files.py
parent5d60719e42fdc0d007920d946f1c1bb440cedab7 (diff)
downloadbuild-8b72aefb5a8ed4da28c6f83854e8babf53b9cb53.zip
build-8b72aefb5a8ed4da28c6f83854e8babf53b9cb53.tar.gz
build-8b72aefb5a8ed4da28c6f83854e8babf53b9cb53.tar.bz2
Make releasetools pylint clean.
This caught a few bugs/syntax errors (a few character classes were not escaped properly in regex patterns, some indentation was illegal, etc). Change-Id: I50637607524e68c4fb9cad7167f58a46b8d26b2c
Diffstat (limited to 'tools/releasetools/img_from_target_files.py')
-rwxr-xr-xtools/releasetools/img_from_target_files.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/tools/releasetools/img_from_target_files.py b/tools/releasetools/img_from_target_files.py
index 4dda0b7..8c5acd8 100755
--- a/tools/releasetools/img_from_target_files.py
+++ b/tools/releasetools/img_from_target_files.py
@@ -32,18 +32,10 @@ if sys.hexversion < 0x02070000:
print >> sys.stderr, "Python 2.7 or newer is required."
sys.exit(1)
-import errno
import os
-import re
import shutil
-import subprocess
-import tempfile
import zipfile
-# missing in Python 2.4 and before
-if not hasattr(os, "SEEK_SET"):
- os.SEEK_SET = 0
-
import common
OPTIONS = common.OPTIONS
@@ -58,7 +50,7 @@ def CopyInfo(output_zip):
def main(argv):
bootable_only = [False]
- def option_handler(o, a):
+ def option_handler(o, _):
if o in ("-z", "--bootable_zip"):
bootable_only[0] = True
else:
@@ -116,7 +108,7 @@ def main(argv):
boot_image = common.GetBootableImage(
"boot.img", "boot.img", OPTIONS.input_tmp, "BOOT")
if boot_image:
- boot_image.AddToZip(output_zip)
+ boot_image.AddToZip(output_zip)
recovery_image = common.GetBootableImage(
"recovery.img", "recovery.img", OPTIONS.input_tmp, "RECOVERY")
if recovery_image:
@@ -157,7 +149,7 @@ if __name__ == '__main__':
try:
common.CloseInheritedPipes()
main(sys.argv[1:])
- except common.ExternalError, e:
+ except common.ExternalError as e:
print
print " ERROR: %s" % (e,)
print