Fix python scripts in src/tools/

tools/python/google/httpd_utils.py

-#!/bin/env python
-# Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+#!/usr/bin/env python
+# Copyright (c) 2011 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.
 
 """A class to help start/stop a local apache http server."""
 
 import logging
 import optparse
 import os
 import subprocess
 import sys
@@ skipping 149 matching lines @@
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE)
       logging.info('%s\n%s' % (kill_proc.stdout.read(),
                                kill_proc.stderr.read()))
       self._http_server_proc = None
       if self._cygserver_path:
         subprocess.Popen(["taskkill.exe", "/f", "/im", "cygserver.exe"],
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)
 
-if '__main__' == __name__:
+
+def main():
   # Provide some command line params for starting/stopping the http server
   # manually.
   option_parser = optparse.OptionParser()
   option_parser.add_option('-k', '--server', help='Server action (start|stop)')
   option_parser.add_option('-r', '--root', help='Document root (optional)')
   option_parser.add_option('-a', '--apache2', action='store_true',
       default=False, help='Starts Apache 2 instead of Apache 1.3 (default). '
                           'Ignored on Mac (apache2 is used always)')
   options, args = option_parser.parse_args()
 
   if not options.server:
     print ("Usage: %s -k {start|stop} [-r document_root] [--apache2]" %
            sys.argv[0])
-    sys.exit(0)
+    return 1
 
   document_root = None
   if options.root:
     document_root = options.root
 
   if 'start' == options.server:
     StartServer(document_root, apache2=options.apache2)
   else:
     StopServers(apache2=options.apache2)
 
+
+if '__main__' == __name__:
+  sys.exit(main())