Migrate and merge logging_utils from swarming_bot into client/utils.

client/isolateserver.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.
 
 """Archives a set of files or directories to an Isolate Server."""
 
 __version__ = '0.4.3'
 
 import base64
@@ skipping 10 matching lines @@
 import types
 import urllib
 import urlparse
 import zlib
 
 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 logging_utils
 from utils import lru
 from utils import net
 from utils import on_error
 from utils import threading_utils
 from utils import tools
 
 import auth
 import isolated_format
 
 
@@ skipping 2132 matching lines @@
 
     # |options.cache| path may not exist until DiskCache() instance is created.
     return DiskCache(
         unicode(os.path.abspath(options.cache)),
         policies,
         isolated_format.get_hash_algo(options.namespace))
   else:
     return MemoryCache()
 
 
-class OptionParserIsolateServer(tools.OptionParserWithLogging):
+class OptionParserIsolateServer(logging_utils.OptionParserWithLogging):
   def __init__(self, **kwargs):
-    tools.OptionParserWithLogging.__init__(
+    logging_utils.OptionParserWithLogging.__init__(
         self,
         version=__version__,
         prog=os.path.basename(sys.modules[__name__].__file__),
         **kwargs)
     auth.add_auth_options(self)
 
   def parse_args(self, *args, **kwargs):
-    options, args = tools.OptionParserWithLogging.parse_args(
+    options, args = logging_utils.OptionParserWithLogging.parse_args(
         self, *args, **kwargs)
     auth.process_auth_options(self, options)
     return options, args
 
 
 def main(args):
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParserIsolateServer(), args)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   tools.disable_buffering()
   colorama.init()
   sys.exit(main(sys.argv[1:]))