Enter a description of the change.

gclient_utils.py

 # Copyright 2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 280 matching lines @@
     self.lock = threading.Lock()
     self.stdout = stdout
     self.delay = delay
     self.last_flushed_at = time.time()
     self.stdout.flush()
 
   def write(self, out):
     """Thread-safe."""
     self.stdout.write(out)
     should_flush = False
-    with self.lock:
+    self.lock.acquire()
+    try:
       if (time.time() - self.last_flushed_at) > self.delay:
         should_flush = True
         self.last_flushed_at = time.time()
+    finally:
+      self.lock.release()
     if should_flush:
       self.stdout.flush()
 
   def flush(self):
     self.stdout.flush()
 
 
 def CheckCallAndFilter(args, stdout=None, filter_fn=None,
                        print_stdout=None, call_filter_on_first_line=False,
                        **kwargs):
@@ skipping 266 matching lines @@
         if exception:
           self.parent.exceptions.append(exception)
         if self.parent.progress:
           self.parent.progress.update(1)
         assert not self.item.name in self.parent.ran
         if not self.item.name in self.parent.ran:
           self.parent.ran.append(self.item.name)
       finally:
         self.parent.ready_cond.notifyAll()
         self.parent.ready_cond.release()