Merge remote branch 'cros/upstream' into tempbranch

client/common_lib/autotemp.py

 """
 Autotest tempfile wrapper for mkstemp (known as tempfile here) and
 mkdtemp (known as tempdir).
 
 This wrapper provides a mechanism to clean up temporary files/dirs once they
 are no longer need.
 
 Files/Dirs will have a unique_id prepended to the suffix and a
 _autotmp_ tag appended to the prefix.
 
@@ skipping 13 matching lines @@
 
     @param unique_id: required, a unique string to help identify what
                       part of code created the tempfile.
     @var name: The name of the temporary file.
     @var fd:  the file descriptor of the temporary file that was created.
     @return a tempfile object
     example usage:
         t = autotemp.tempfile(unique_id='fig')
         t.name # name of file
         t.fd   # file descriptor
+        t.fo   # file object
         t.clean() # clean up after yourself
     """
     def __init__(self, unique_id, suffix='', prefix='', dir=None,
                  text=False):
         suffix = unique_id + suffix
         prefix = prefix + _TEMPLATE
         self.fd, self.name = module_tempfile.mkstemp(suffix=suffix,
                                                      prefix=prefix,
                                                      dir=dir, text=text)
+        self.fo = os.fdopen(self.fd)
 
 
     def clean(self):
         """
         Remove the temporary file that was created.
         This is also called by the destructor.
         """
+        if self.fo:
+            self.fo.close()
         if self.name and os.path.exists(self.name):
             os.remove(self.name)
 
-        self.fd = self.name = None
+        self.fd = self.fo = self.name = None
 
 
     def __del__(self):
         try:
-            if self.name:
+            if self.name is not None:
                 logging.debug('Clean was not called for ' + self.name)
                 self.clean()
         except:
             try:
                 msg = 'An exception occurred while calling the destructor'
                 logging.exception(msg)
             except:
                 pass
 
 
@@ skipping 30 matching lines @@
         try:
             if self.name:
                 logging.debug('Clean was not called for ' + self.name)
                 self.clean()
         except:
             try:
                 msg = 'An exception occurred while calling the destructor'
                 logging.exception(msg)
             except:
                 pass