PyAuto remote_host Mac fixes.

chrome/test/pyautolib/remote_host.py

 #!/usr/bin/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.
 
 import cStringIO
 import os
 import pickle
 import socket
 import sys
@@ skipping 16 matching lines @@
     listening_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     listening_socket.bind(('', port))
     listening_socket.listen(1)
     self._socket, _ = listening_socket.accept()
 
     while self.Connected():
       self._HandleRPC()
 
   def StopSocketServer(self):
     if self._socket:
-      self._socket.shutdown(socket.SHUT_RDWR)
-      self._socket.close()
+      try:
+        self._socket.shutdown(socket.SHUT_RDWR)
+        self._socket.close()
+      except socket.error:
+        pass
       self._socket = None
 
   def Connected(self):
     return self._socket
 
   def CreateTarget(self, target_class):
     """Creates an instance of the specified class to serve as the RPC target.
 
     RPC calls can be made on the target.
     """
@@ skipping 20 matching lines @@
     sys.stderr = stderr = cStringIO.StringIO()
 
     # Make requested method call.
     result = None
     exception = None
     try:
       if getattr(self, request[0], None):
         result = getattr(self, request[0])(*request[1], **request[2])
       else:
         result = getattr(self.target, request[0])(*request[1], **request[2])
-    except BaseException as e:
+    except BaseException, e:
       exception = (e.__class__.__name__, str(e))
 
     # Put output back to the way it was before.
     sys.stdout = old_stdout
     sys.stderr = old_stderr
 
     # Package up and send the result of the method call.
     response = pickle.dumps((result, stdout.getvalue(), stderr.getvalue(),
                              exception))
     if self._socket.send(response) != len(response):
       self.StopSocketServer()