[NaCl SDK] Convert python scripts from optparse to argparse.

native_client_sdk/src/tools/httpd.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.
 
 import BaseHTTPServer
 import logging
 import multiprocessing
-import optparse
+import argparse

[binji, 2014/11/13 23:57:04]

sort

[Sam Clegg, 2014/11/30 17:55:13]

Done.

 import os
 import SimpleHTTPServer  # pylint: disable=W0611
 import socket
 import sys
 import time
 import urlparse
 
 if sys.version_info < (2, 6, 0):

[binji, 2014/11/13 23:57:04]

2.7

[Sam Clegg, 2014/11/30 17:55:13]

Seperate CL

   sys.stderr.write("python 2.6 or later is required run this script\n")
   sys.exit(1)
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 NACL_SDK_ROOT = os.path.dirname(SCRIPT_DIR)
 
 
 # We only run from the examples directory so that not too much is exposed
 # via this HTTP server.  Everything in the directory is served, so there should
@@ skipping 150 matching lines @@
       if conn.poll():
         httpd.running = conn.recv()
   except KeyboardInterrupt:
     pass
   finally:
     conn.send(httpd.result)
     conn.close()
 
 
 def main(args):
-  parser = optparse.OptionParser()
-  parser.add_option('-C', '--serve-dir',
+  parser = argparse.ArgumentParser()
+  parser.add_argument('-C', '--serve-dir',
       help='Serve files out of this directory.',
       default=os.path.abspath('.'))
-  parser.add_option('-p', '--port',
+  parser.add_argument('-p', '--port',
       help='Run server on this port.', default=5103)
-  parser.add_option('--no-dir-check', '--no_dir_check',
+  parser.add_argument('--no-dir-check', '--no_dir_check',
       help='No check to ensure serving from safe directory.',
       dest='do_safe_check', action='store_false', default=True)
 
   # To enable bash completion for this command first install optcomplete
   # and then add this line to your .bashrc:
   #  complete -F _optcomplete httpd.py
   try:
     import optcomplete
     optcomplete.autocomplete(parser)
   except ImportError:
     pass
 
   options, args = parser.parse_args(args)

[binji, 2014/11/13 23:57:04]

fix

[Sam Clegg, 2014/11/30 17:55:13]

Done.

   if options.do_safe_check:
     SanityCheckDirectory(options.serve_dir)
 
   server = LocalHTTPServer(options.serve_dir, int(options.port))
 
   # Serve until the client tells us to stop. When it does, it will give us an
   # errorcode.
   print 'Serving %s on %s...' % (options.serve_dir, server.GetURL(''))
   return server.ServeForever()
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))