[Android] Linting the rest of build/android/

build/android/adb_logcat_monitor.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Saves logcats from all connected devices.
 
 Usage: adb_logcat_monitor.py <base_dir> [<adb_binary_path>]
 
@@ skipping 90 matching lines @@
     print 'adb_logcat_monitor: %s already exists? Cleaning' % base_dir
     shutil.rmtree(base_dir, ignore_errors=True)
 
   os.makedirs(base_dir)
   logging.basicConfig(filename=os.path.join(base_dir, 'eventlog'),
                       level=logging.INFO,
                       format='%(asctime)-2s %(levelname)-8s %(message)s')
 
   # Set up the alarm for calling 'adb devices'. This is to ensure
   # our script doesn't get stuck waiting for a process response
-  def TimeoutHandler(_, unused_frame):
+  def TimeoutHandler(_signum, _unused_frame):
     raise TimeoutException()
   signal.signal(signal.SIGALRM, TimeoutHandler)
 
   # Handle SIGTERMs to ensure clean shutdown
-  def SigtermHandler(_, unused_frame):
+  def SigtermHandler(_signum, _unused_frame):
     raise SigtermError()
   signal.signal(signal.SIGTERM, SigtermHandler)
 
   logging.info('Started with pid %d', os.getpid())
   pid_file_path = os.path.join(base_dir, 'LOGCAT_MONITOR_PID')
 
   try:
     with open(pid_file_path, 'w') as f:
       f.write(str(os.getpid()))
     while True:
@@ skipping 20 matching lines @@
           pass
     os.remove(pid_file_path)
 
 
 if __name__ == '__main__':
   if 2 <= len(sys.argv) <= 3:
     print 'adb_logcat_monitor: Initializing'
     sys.exit(main(*sys.argv[1:3]))
 
   print 'Usage: %s <base_dir> [<adb_binary_path>]' % sys.argv[0]