Revert of Add field_specs to all metrics in luci-py

client/third_party/infra_libs/utils.py

 # Copyright 2015 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.
 
 """Miscellaneous utility functions."""
 
 
 import contextlib
 import errno
 import json
@@ skipping 57 matching lines @@
 
   Even with all this, Windows still sometimes fails to delete a file, citing
   a permission error (maybe something to do with antivirus scans or disk
   indexing).  The best suggestion any of the user forums had was to wait a
   bit and try again, so we do that too.  It's hand-waving, but sometimes it
   works. :/
   """
   if not os.path.exists(file_path):
     return
 
-  if os.path.isfile(file_path):
-    for i in xrange(3):
-      try:
-        os.remove(file_path)
-        return
-      except OSError:
-        if i == 2:
-          raise
-        time.sleep(3)
-
   if sys.platform == 'win32':
     # Give up and use cmd.exe's rd command.
     file_path = os.path.normcase(file_path)
-    for i in xrange(3):
-      try:
-        subprocess.check_call(['cmd.exe', '/c', 'rd', '/q', '/s', file_path])
-        return
-      except subprocess.CalledProcessError:
-        if i == 2:
-          raise
-        time.sleep(3)
+    for _ in xrange(3):
+      if not subprocess.call(['cmd.exe', '/c', 'rd', '/q', '/s', file_path]):
+        break
+      time.sleep(3)
+    return
 
   def remove_with_retry(rmfunc, path):
     if os.path.islink(path):
       return os.remove(path)
     else:
       return rmfunc(path)
 
   def rmtree_on_error(function, _, excinfo):
     """This works around a problem whereby python 2.x on Windows has no ability
     to check for symbolic links.  os.path.islink always returns False.  But
@@ skipping 65 matching lines @@
     yield tempdir
 
   finally:
     if tempdir and not keep_directory:  # pragma: no branch
       try:
         # TODO(pgervais,496347) Make this work reliably on Windows.
         shutil.rmtree(tempdir, ignore_errors=True)
       except OSError as ex:  # pragma: no cover
         print >> sys.stderr, (
           "ERROR: {!r} while cleaning up {!r}".format(ex, tempdir))