Fix ./swarming.py query-list.

client/swarming.py

 #!/usr/bin/env python
 # Copyright 2013 The LUCI 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.9'
+__version__ = '0.8.10'
 
 import collections
 import datetime
 import json
 import logging
 import optparse
 import os
 import subprocess
 import sys
+import textwrap
 import threading
 import time
 import urllib
 
 from third_party import colorama
 from third_party.depot_tools import fix_encoding
 from third_party.depot_tools import subcommand
 
 from utils import file_path
 from utils import fs
@@ skipping 1373 matching lines @@
   except APIError as e:
     parser.error(str(e))
   if options.json:
     options.json = unicode(os.path.abspath(options.json))
     with fs.open(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()):
+    for i, (api_id, api) in enumerate(sorted(apis.iteritems())):
+      if i:
+        print('')
       print api_id
-      print '  ' + api['description']
-      for resource_name, resource in sorted(api['resources'].iteritems()):
-        print ''
-        for method_name, method in sorted(resource['methods'].iteritems()):
+      print '  ' + api['description'].strip()
+      if 'resources' in api:
+        # Old.
+        for j, (resource_name, resource) in enumerate(
+            sorted(api['resources'].iteritems())):
+          if j:
+            print('')
+          for method_name, method in sorted(resource['methods'].iteritems()):
+            # Only list the GET ones.
+            if method['httpMethod'] != 'GET':
+              continue
+            print '- %s.%s: %s' % (
+                resource_name, method_name, method['path'])
+            print('\n'.join(
+                '  ' + l for l in textwrap.wrap(method['description'], 78)))
+            print '  %s%s%s' % (help_url, api['servicePath'], method['id'])
+      else:
+        # New.
+        for method_name, method in sorted(api['methods'].iteritems()):
           # Only list the GET ones.
           if method['httpMethod'] != 'GET':
             continue
-          print '- %s.%s: %s' % (
-              resource_name, method_name, method['path'])
-          print '  ' + method['description']
+          print '- %s: %s' % (method['id'], method['path'])
+          print('\n'.join(
+              '  ' + l for l in textwrap.wrap(method['description'], 78)))
           print '  %s%s%s' % (help_url, api['servicePath'], method['id'])
   return 0
 
 
 @subcommand.usage('(hash|isolated) [-- extra_args]')
 def CMDrun(parser, args):
   """Triggers a task and wait for the results.
 
   Basically, does everything to run a command remotely.
   """
@@ skipping 234 matching lines @@
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParserSwarming(version=__version__), args)
 
 
 if __name__ == '__main__':
   subprocess42.inhibit_os_error_reporting()
   fix_encoding.fix_encoding()
   tools.disable_buffering()
   colorama.init()
   sys.exit(main(sys.argv[1:]))