Fix regression in 49abac87faa60.

client/swarming.py

 #!/usr/bin/env python
 # Copyright 2013 The Swarming Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0 that
 # can be found in the LICENSE file.
 
 """Client tool to trigger tasks or retrieve results from a Swarming server."""
 
 __version__ = '0.8.2'
 
 import collections
@@ skipping 1045 matching lines @@
       '-j', '--json',
       help='Load the task ids from .json as saved by trigger --dump-json')
   options, args = parser.parse_args(args)
   if not args and not options.json:
     parser.error('Must specify at least one task id or --json.')
   if args and options.json:
     parser.error('Only use one of task id or --json.')
 
   if options.json:
     try:
-      with fs.open(options.json, 'rb') as f:
+      with fs.open(unicode(options.json), 'rb') as f:
         tasks = sorted(
             json.load(f)['tasks'].itervalues(), key=lambda x: x['shard_index'])
         args = [t['task_id'] for t in tasks]
     except (KeyError, IOError, TypeError, ValueError):
       parser.error('Failed to parse %s' % options.json)
   else:
     valid = frozenset('0123456789abcdef')
     if any(not valid.issuperset(task_id) for task_id in args):
       parser.error('Task ids are 0-9a-f.')
 
@@ skipping 100 matching lines @@
     data['items'].extend(new['items'])
     data['cursor'] = new.get('cursor')
 
   if options.progress:
     print('')
   if options.limit and len(data.get('items', [])) > options.limit:
     data['items'] = data['items'][:options.limit]
   data.pop('cursor', None)
 
   if options.json:
-    tools.write_json(options.json, data, True)
+    tools.write_json(unicode(options.json), data, True)
   else:
     try:
       tools.write_json(sys.stdout, data, False)
       sys.stdout.write('\n')
     except IOError:
       pass
   return 0
 
 
 def CMDquery_list(parser, args):
   """Returns list of all the Swarming APIs that can be used with command
   'query'.
   """
   parser.add_option(
       '--json', help='Path to JSON output file (otherwise prints to stdout)')
   options, args = parser.parse_args(args)
   if args:
     parser.error('No argument allowed.')
 
   try:
     apis = endpoints_api_discovery_apis(options.swarming)
   except APIError as e:
     parser.error(str(e))
   if options.json:
-    with fs.open(options.json, 'wb') as f:
+    with fs.open(unicode(options.json), 'wb') as f:
       json.dump(apis, f)
   else:
     help_url = (
       'https://apis-explorer.appspot.com/apis-explorer/?base=%s/_ah/api#p/' %
       options.swarming)
     for api_id, api in sorted(apis.iteritems()):
       print api_id
       print '  ' + api['description']
       for resource_name, resource in sorted(api['resources'].iteritems()):
         print ''
@@ skipping 136 matching lines @@
         options.swarming, task_request, options.shards)
     if tasks:
       print('Triggered task: %s' % options.task_name)
       tasks_sorted = sorted(
           tasks.itervalues(), key=lambda x: x['shard_index'])
       if options.dump_json:
         data = {
           'base_task_name': options.task_name,
           'tasks': tasks,
         }
-        tools.write_json(options.dump_json, data, True)
+        tools.write_json(unicode(options.dump_json), data, True)
         print('To collect results, use:')
         print('  swarming.py collect -S %s --json %s' %
             (options.swarming, options.dump_json))
       else:
         print('To collect results, use:')
         print('  swarming.py collect -S %s %s' %
             (options.swarming, ' '.join(t['task_id'] for t in tasks_sorted)))
       print('Or visit:')
       for t in tasks_sorted:
         print('  ' + t['view_url'])
@@ skipping 46 matching lines @@
 def main(args):
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParserSwarming(version=__version__), args)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   tools.disable_buffering()
   colorama.init()
   sys.exit(main(sys.argv[1:]))