Fix android presubmit errors.

build/android/adb_logcat_printer.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.
 
 """Shutdown adb_logcat_monitor and print accumulated logs.
 
 To test, call './adb_logcat_printer.py <base_dir>' where
 <base_dir> contains 'adb logcat -v threadtime' files named as
 logcat_<deviceID>_<sequenceNum>
 
 The script will print the files to out, and will combine multiple
 logcats from a single device if there is overlap.
 
 Additionally, if a <base_dir>/LOGCAT_MONITOR_PID exists, the script
 will attempt to terminate the contained PID by sending a SIGINT and
 monitoring for the deletion of the aforementioned file.
 """
 
 import cStringIO
 import logging
+import optparse
 import os
 import re
 import signal
 import sys
 import time
 
 
 # Set this to debug for more verbose output
 LOG_LEVEL = logging.INFO
 
@@ skipping 12 matching lines @@
   for cur_file, cur_file_lines in list_of_lists:
     # Ignore files with just the logcat header
     if len(cur_file_lines) < 2:
       continue
     common_index = 0
     # Skip this step if list just has empty string
     if len(cur_device_log) > 1:
       try:
         line = cur_device_log[-1]
         # Used to make sure we only splice on a timestamped line
-        if re.match('^\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3} ', line):
+        if re.match(r'^\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3} ', line):
           common_index = cur_file_lines.index(line)
         else:
           logger.warning('splice error - no timestamp in "%s"?', line.strip())
       except ValueError:
         # The last line was valid but wasn't found in the next file
         cur_device_log += ['***** POSSIBLE INCOMPLETE LOGCAT *****']
         logger.info('Unable to splice %s. Incomplete logcat?', cur_file)
 
     cur_device_log += ['*'*30 + '  %s' % cur_file]
     cur_device_log.extend(cur_file_lines[common_index:])
 
   return cur_device_log
 
 
 def FindLogFiles(base_dir):
   """Search a directory for logcat files.
 
   Args:
     base_dir: directory to search
 
   Returns:
     Mapping of device_id to a sorted list of file paths for a given device
   """
-  logcat_filter = re.compile('^logcat_(\w+)_(\d+)$')
+  logcat_filter = re.compile(r'^logcat_(\w+)_(\d+)$')
   # list of tuples (<device_id>, <seq num>, <full file path>)
   filtered_list = []
   for cur_file in os.listdir(base_dir):
     matcher = logcat_filter.match(cur_file)
     if matcher:
       filtered_list += [(matcher.group(1), int(matcher.group(2)),
                          os.path.join(base_dir, cur_file))]
   filtered_list.sort()
   file_map = {}
   for device_id, _, cur_file in filtered_list:
-    if not device_id in file_map:
+    if device_id not in file_map:
       file_map[device_id] = []
 
     file_map[device_id] += [cur_file]
   return file_map
 
 
 def GetDeviceLogs(log_filenames, logger):
   """Read log files, combine and format.
 
   Args:
@@ skipping 41 matching lines @@
       logger.info('Waiting for logcat process to terminate.')
       i += 1
       if i >= 10:
         logger.warning('Monitor pid did not terminate. Continuing anyway.')
         return
 
   except (ValueError, IOError, OSError):
     logger.exception('Error signaling logcat monitor - continuing')
 
 
-def main(base_dir, output_file):
+def main(argv):
+  parser = optparse.OptionParser(usage='Usage: %prog [options] <log dir>')

[bulach, 2013/11/14 19:50:04]

nit: while at it, it seems a bit confusing to have --output-path and <log dir>..
any chance of having just one, or explicit options for both?

[Isaac (away), 2013/11/21 11:11:34]

--output-path is optional, while the extra arg is always required.  I don't
usually override nits, but I really want to fix the android presubmit, and I
also believe this whole file's api is bad and will need to be redone.  WDYT?

+  parser.add_option('--output-path',
+                    help='Output file path (if unspecified, prints to stdout)')
+  options, args = parser.parse_args(argv)
+  if len(args) != 1:
+    parser.error('Wrong number of unparsed args')
+  base_dir = args[0]
+  if options.output_path:
+    output_file = open(options.output_path, 'w')
+  else:
+    output_file = sys.stdout
+
   log_stringio = cStringIO.StringIO()
   logger = logging.getLogger('LogcatPrinter')
   logger.setLevel(LOG_LEVEL)
   sh = logging.StreamHandler(log_stringio)
   sh.setFormatter(logging.Formatter('%(asctime)-2s %(levelname)-8s'
                                     ' %(message)s'))
   logger.addHandler(sh)
 
   try:
     # Wait at least 5 seconds after base_dir is created before printing.
@@ skipping 26 matching lines @@
       output_file.write(f.read())
   except:
     logger.exception('Unexpected exception')
 
   logger.info('Done.')
   sh.flush()
   output_file.write('\nLogcat Printer Event Log\n')
   output_file.write(log_stringio.getvalue())
 
 if __name__ == '__main__':
-  if len(sys.argv) == 1:
-    print 'Usage: %s <base_dir>' % sys.argv[0]
-    sys.exit(1)
-  sys.exit(main(sys.argv[1], sys.stdout))
+  sys.exit(main(sys.argv[1:]))