Merge remote branch 'autotest-upstream/master' into try-box1

client/bin/local_host.py

 # Copyright 2009 Google Inc. Released under the GPL v2
 
 """
 This file contains the implementation of a host object for the local machine.
 """
 
-import glob, httplib, logging, os, platform, socket, urlparse
+import glob, os, platform
+from autotest_lib.client.common_lib import hosts, error
 from autotest_lib.client.bin import utils
-from autotest_lib.client.common_lib import error, hosts
 from autotest_lib.client.common_lib.cros import autoupdater
 
 
 class LocalHost(hosts.Host):
     def _initialize(self, hostname=None, bootloader=None, *args, **dargs):
         super(LocalHost, self)._initialize(*args, **dargs)
 
         # hostname will be an actual hostname when this client was created
         # by an autoserv process
         if not hostname:
@@ skipping 63 matching lines @@
             if not os.path.exists(path):
                 continue
             closure.add(path)
             if os.path.islink(path):
                 link_to = os.path.join(os.path.dirname(path),
                                        os.readlink(path))
                 if link_to not in closure:
                     paths.add(link_to)
 
         return closure